import handle
import aliasing
import simple_presence
+import presence
+import capabilities
import channel_manager
telepathy.server.Connection,
aliasing.AliasingMixin,
simple_presence.SimplePresenceMixin,
+ presence.PresenceMixin,
+ capabilities.CapabilitiesMixin,
):
# Overriding a base class variable
)
aliasing.AliasingMixin.__init__(self)
simple_presence.SimplePresenceMixin.__init__(self)
+ presence.PresenceMixin.__init__(self)
+ capabilities.CapabilitiesMixin.__init__(self)
self._manager = weakref.proxy(manager)
self._credentials = (
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")
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:
"""
_moduleLogger.info("Disconnecting")
try:
- self.session.logout()
+ 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")
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):
h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
return h
- @coroutines.func_sink
- @coroutines.expand_positional
@gobject_utils.async
- def _on_conversations_updated(self, conversationIds):
+ @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
for contactId, phoneNumber in conversationIds:
- h = self._create_contact_handle(contactId, phoneNumber)
- # if its new, __init__ will take care of things
- # if its old, its own update will take care of it
- channel = channelManager.channel_for_text(handle)
+ 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)