Adding the ignore file

[gc-dialer] / src / backends / gv_backend.py

diff --git a/src/backends/gv_backend.py b/src/backends/gv_backend.py
index df9e3a6..ace5243 100644 (file)
--- a/src/backends/gv_backend.py
+++ b/src/backends/gv_backend.py
@@ -27,6 +27,7 @@ Resources
 
 from __future__ import with_statement
 
+import itertools
 import logging
 
 import gvoice
@@ -85,8 +86,8 @@ class GVDialer(object):
                """
                return self._gvoice.cancel(outgoingNumber)
 
-       def send_sms(self, phoneNumber, message):
-               self._gvoice.send_sms(phoneNumber, message)
+       def send_sms(self, phoneNumbers, message):
+               self._gvoice.send_sms(phoneNumbers, message)
 
        def search(self, query):
                """
@@ -168,13 +169,16 @@ class GVDialer(object):
                if self._contacts is None:
                        self._update_contacts_cache()
                contactDetails = self._contacts[contactId]
+               # Defaulting phoneTypes because those are just things like faxes
                return (
                        (number.get("phoneType", ""), number["phoneNumber"])
                        for number in contactDetails["numbers"]
                )
 
        def get_messages(self):
-               conversations = self._gvoice.get_conversations()
+               voicemails = self._gvoice.get_voicemails()
+               smss = self._gvoice.get_texts()
+               conversations = itertools.chain(voicemails, smss)
                for conversation in conversations:
                        messages = conversation.messages
                        messageParts = (