Starting to play with TheOneRing inside of empathy :)

[theonering] / src / gvoice / backend.py

diff --git a/src/gvoice/backend.py b/src/gvoice/backend.py
index ad3a20e..b2b01a3 100755 (executable)
--- a/src/gvoice/backend.py
+++ b/src/gvoice/backend.py
@@ -79,7 +79,7 @@ class GVoiceBackend(object):
 
                # Suprisingly, moving all of these from class to self sped up startup time
 
-               self._validateRe = re.compile("^[0-9]{10,}$")
+               self._validateRe = re.compile("^\+?[0-9]{10,}$")
 
                self._loginURL = "https://www.google.com/accounts/ServiceLoginAuth"
 
@@ -99,6 +99,7 @@ class GVoiceBackend(object):
 
                self._XML_SEARCH_URL = SECURE_URL_BASE + "inbox/search/"
                self._XML_ACCOUNT_URL = SECURE_URL_BASE + "contacts/"
+               # HACK really this redirects to the main pge and we are grabbing some javascript
                self._XML_CONTACTS_URL = "http://www.google.com/voice/inbox/search/contact"
                self._XML_RECENT_URL = SECURE_URL_BASE + "inbox/recent/"
 
@@ -386,7 +387,9 @@ class GVoiceBackend(object):
                        raise RuntimeError("Could not extract contact information")
                accountData = _fake_parse_json(contactsBody.group(1))
                for contactId, contactDetails in accountData["contacts"].iteritems():
-                       yield contactId, contactDetails
+                       # A zero contact id is the catch all for unknown contacts
+                       if contactId != "0":
+                               yield contactId, contactDetails
 
        def get_messages(self):
                voicemailPage = self._get_page(self._XML_VOICEMAIL_URL)