Fixing a tp bug preventing channels from closing

[theonering] / src / connection.py

diff --git a/src/connection.py b/src/connection.py
index cc98363..36624b3 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -1,7 +1,6 @@
 
 """
 @todo Add params for different state machines update times
-@todo Add option to use screen name as callback
 @todo Get a callback for missed calls to force an update of the voicemail state machine
 @todo Get a callback on an incoming call and if its from GV, auto-pickup
 @todo Decide if we should do what the spec suggests and hold onto a singleton contactlist
@@ -52,19 +51,21 @@ class TheOneRingConnection(
        capabilities.CapabilitiesMixin,
 ):
 
-       # Overriding a base class variable
-       # Should the forwarding number be handled by the alias or by an option?
+       # overiding base class variable
        _mandatory_parameters = {
                'account' : 's',
                'password' : 's',
        }
-       # Overriding a base class variable
+       # overiding base class variable
        _optional_parameters = {
                'forward' : 's',
        }
        _parameter_defaults = {
                'forward' : '',
        }
+       _secret_parameters = set((
+               "password",
+       ))
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def __init__(self, manager, parameters):
@@ -77,6 +78,7 @@ class TheOneRingConnection(
                        raise telepathy.errors.InvalidArgument("Invalid forwarding number")
 
                # Connection init must come first
+               self.__session = gvoice.session.Session(None)
                tp.Connection.__init__(
                        self,
                        constants._telepathy_protocol_name_,
@@ -98,7 +100,6 @@ class TheOneRingConnection(
                self.__callbackNumberParameter = encodedCallback
                self.__channelManager = channel_manager.ChannelManager(self)
 
-               self.__session = gvoice.session.Session(None)
                if conic is not None:
                        self.__connection = conic.Connection()
                        self.__connectionEventId = None
@@ -137,17 +138,7 @@ class TheOneRingConnection(
                requestedHandleName = handleName.encode('utf-8')
                if handleType == telepathy.HANDLE_TYPE_CONTACT:
                        _moduleLogger.info("get_handle_by_name Contact: %s" % requestedHandleName)
-                       requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
-                               requestedHandleName
-                       )
-                       if not requestedContactId:
-                               # Sometimes GV doesn't give us a contactid for contacts, so
-                               # let's slow things down just a tad for better consistency for
-                               # the user
-                               ids = list(self.session.addressbook.find_contacts_with_number(requestedContactNumber))
-                               if ids:
-                                       requestedContactId = ids[0]
-                       h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
+                       h = handle.create_handle(self, 'contact', requestedHandleName)
                elif handleType == telepathy.HANDLE_TYPE_LIST:
                        # Support only server side (immutable) lists
                        _moduleLogger.info("get_handle_by_name List: %s" % requestedHandleName)
@@ -171,8 +162,6 @@ class TheOneRingConnection(
                        telepathy.CONNECTION_STATUS_REASON_REQUESTED
                )
                try:
-                       cookieFilePath = None
-                       self.__session = gvoice.session.Session(cookieFilePath)
                        self.__session.load(self.__cachePath)
 
                        self.__callback = coroutines.func_sink(
@@ -292,9 +281,8 @@ class TheOneRingConnection(
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_conversations_updated(self, conv, conversationIds):
                _moduleLogger.debug("Incoming messages from: %r" % (conversationIds, ))
-               for contactId, phoneNumber in conversationIds:
-                       handleName = handle.ContactHandle.to_handle_name(contactId, phoneNumber)
-                       h = self.get_handle_by_name(telepathy.HANDLE_TYPE_CONTACT, handleName)
+               for phoneNumber in conversationIds:
+                       h = self.get_handle_by_name(telepathy.HANDLE_TYPE_CONTACT, phoneNumber)
                        # Just let the TextChannel decide whether it should be reported to the user or not
                        props = self._generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False)
                        chan = self.__channelManager.channel_for_props(props, signal=True)
@@ -303,6 +291,8 @@ class TheOneRingConnection(
        def _on_connection_change(self, connection, event):
                """
                @note Maemo specific
+
+               @todo Make this delayed to handle background switching of networks
                """
                status = event.get_status()
                error = event.get_error()