Adding old-school presence so I can get presence support working in Empathy, wahooo

[theonering] / src / connection.py

diff --git a/src/connection.py b/src/connection.py
index 9071996..f359cd5 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -4,11 +4,15 @@ import logging
 import telepathy
 
 import constants
+import util.go_utils as gobject_utils
+import util.coroutines as coroutines
 import gtk_toolbox
 import gvoice
 import handle
 import aliasing
 import simple_presence
+import presence
+import capabilities
 import channel_manager
 
 
@@ -19,9 +23,12 @@ class TheOneRingConnection(
        telepathy.server.Connection,
        aliasing.AliasingMixin,
        simple_presence.SimplePresenceMixin,
+       presence.PresenceMixin,
+       capabilities.CapabilitiesMixin,
 ):
 
        # Overriding a base class variable
+       # Should the forwarding number be handled by the alias or by an option?
        _mandatory_parameters = {
                'username' : 's',
                'password' : 's',
@@ -34,8 +41,8 @@ class TheOneRingConnection(
        }
 
        def __init__(self, manager, parameters):
+               self.check_parameters(parameters)
                try:
-                       self.check_parameters(parameters)
                        account = unicode(parameters['username'])
 
                        # Connection init must come first
@@ -47,6 +54,8 @@ class TheOneRingConnection(
                        )
                        aliasing.AliasingMixin.__init__(self)
                        simple_presence.SimplePresenceMixin.__init__(self)
+                       presence.PresenceMixin.__init__(self)
+                       capabilities.CapabilitiesMixin.__init__(self)
 
                        self._manager = weakref.proxy(manager)
                        self._credentials = (
@@ -56,11 +65,11 @@ class TheOneRingConnection(
                        self._callbackNumber = parameters['forward'].encode('utf-8')
                        self._channelManager = channel_manager.ChannelManager(self)
 
-                       cookieFilePath = "%s/cookies.txt" % constants._data_path_
-                       self._session = gvoice.session.Session(cookieFilePath)
+                       self._session = gvoice.session.Session(None)
 
                        self.set_self_handle(handle.create_handle(self, 'connection'))
 
+                       self._callback = None
                        _moduleLogger.info("Connection to the account %s created" % account)
                except Exception, e:
                        _moduleLogger.exception("Failed to create Connection")
@@ -93,6 +102,17 @@ class TheOneRingConnection(
                        telepathy.CONNECTION_STATUS_REASON_REQUESTED
                )
                try:
+                       cookieFilePath = None
+                       self._session = gvoice.session.Session(cookieFilePath)
+
+                       self._callback = coroutines.func_sink(
+                               coroutines.expand_positional(
+                                       self._on_conversations_updated
+                               )
+                       )
+                       self.session.conversations.updateSignalHandler.register_sink(
+                               self._callback
+                       )
                        self.session.login(*self._credentials)
                        self.session.backend.set_callback_number(self._callbackNumber)
                except gvoice.backend.NetworkError, e:
@@ -122,7 +142,14 @@ class TheOneRingConnection(
                """
                _moduleLogger.info("Disconnecting")
                try:
+                       self.session.conversations.updateSignalHandler.unregister_sink(
+                               self._callback
+                       )
+                       self._callback = None
+                       self._channelManager.close()
                        self.session.logout()
+                       self.session.close()
+                       self._session = None
                        _moduleLogger.info("Disconnected")
                except Exception:
                        _moduleLogger.exception("Disconnecting Failed")
@@ -130,6 +157,7 @@ class TheOneRingConnection(
                        telepathy.CONNECTION_STATUS_DISCONNECTED,
                        telepathy.CONNECTION_STATUS_REASON_REQUESTED
                )
+               self.manager.disconnected(self)
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def RequestChannel(self, type, handleType, handleId, suppressHandler):
@@ -189,20 +217,20 @@ class TheOneRingConnection(
                return handles
 
        def _create_contact_handle(self, requestedHandleName):
-               """
-               @todo Determine if nay of this is really needed
-               """
                requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
                        requestedHandleName
                )
                h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
                return h
 
-       def _on_invite_text(self, contactId):
-               """
-               @todo Make this work
-               """
-               h = self._create_contact_handle(contactId)
-
+       @gobject_utils.async
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_conversations_updated(self, conv, conversationIds):
+               # @todo get conversations update running
+               # @todo test conversatiuons
+               _moduleLogger.info("Incoming messages from: %r" % (conversationIds, ))
                channelManager = self._channelManager
-               channel = channelManager.channel_for_text(handle)
+               for contactId, phoneNumber in conversationIds:
+                       h = handle.create_handle(self, 'contact', contactId, phoneNumber)
+                       # Just let the TextChannel decide whether it should be reported to the user or not
+                       channel = channelManager.channel_for_text(h)