X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fconnection.py;h=8914e2fc299bcdd606efc48c351408b6195bb973;hb=377ccbd973866b96f404708626fa8606ce50c01d;hp=22f09053d32f954d605afc62be4cff7d29e1dde1;hpb=7c771815562d443e4ba262a195267f844cd4f99e;p=theonering diff --git a/src/connection.py b/src/connection.py index 22f0905..8914e2f 100644 --- a/src/connection.py +++ b/src/connection.py @@ -1,9 +1,10 @@ """ -@todo Add params for disable/enable state machines -@todo Separate voicemail/sms into separate conversation instances -@todo Setup addressbook, voicemail, sms state machines +@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 Observe when connected/disconnected to disconnect CM """ @@ -12,16 +13,26 @@ import logging import telepathy +try: + import conic as _conic + conic = _conic +except (ImportError, OSError): + conic = None + import constants import util.go_utils as gobject_utils import util.coroutines as coroutines import gtk_toolbox + import gvoice import handle + +import contacts import aliasing import simple_presence import presence import capabilities + import channel_manager @@ -30,6 +41,8 @@ _moduleLogger = logging.getLogger("connection") class TheOneRingConnection( telepathy.server.Connection, + #telepathy.server.ConnectionInterfaceRequests, # already a mixin + contacts.ContactsMixin, aliasing.AliasingMixin, simple_presence.SimplePresenceMixin, presence.PresenceMixin, @@ -66,37 +79,45 @@ class TheOneRingConnection( account, constants._telepathy_implementation_name_ ) + #telepathy.server.ConnectionInterfaceRequests.__init__(self) + contacts.ContactsMixin.__init__(self) 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.__manager = weakref.proxy(manager) + self.__credentials = ( encodedAccount, encodedPassword, ) - self._callbackNumber = encodedCallback - self._channelManager = channel_manager.ChannelManager(self) + self.__callbackNumber = encodedCallback + self.__channelManager = channel_manager.ChannelManager(self) - self._session = gvoice.session.Session(None) + self.__session = gvoice.session.Session(None) + if conic is not None: + self.__connection = conic.Connection() + self.__connectionEventId = None + else: + self.__connection = None + self.__connectionEventId = None self.set_self_handle(handle.create_handle(self, 'connection')) - self._callback = None + self.__callback = None _moduleLogger.info("Connection to the account %s created" % account) @property def manager(self): - return self._manager + return self.__manager @property def session(self): - return self._session + return self.__session @property def username(self): - return self._credentials[0] + return self.__credentials[0] @property def userAliasType(self): @@ -118,36 +139,43 @@ class TheOneRingConnection( ) try: cookieFilePath = None - self._session = gvoice.session.Session(cookieFilePath) + self.__session = gvoice.session.Session(cookieFilePath) - self._callback = coroutines.func_sink( + self.__callback = coroutines.func_sink( coroutines.expand_positional( self._on_conversations_updated ) ) - self.session.conversations.updateSignalHandler.register_sink( - self._callback + self.session.voicemails.updateSignalHandler.register_sink( + self.__callback ) - self.session.login(*self._credentials) - self.session.backend.set_callback_number(self._callbackNumber) + self.session.texts.updateSignalHandler.register_sink( + self.__callback + ) + self.session.login(*self.__credentials) + self.session.backend.set_callback_number(self.__callbackNumber) except gvoice.backend.NetworkError, e: _moduleLogger.exception("Connection Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR ) + return except Exception, e: _moduleLogger.exception("Connection Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED ) - else: - _moduleLogger.info("Connected") - self.StatusChanged( - telepathy.CONNECTION_STATUS_CONNECTED, - telepathy.CONNECTION_STATUS_REASON_REQUESTED - ) + return + + _moduleLogger.info("Connected") + self.StatusChanged( + telepathy.CONNECTION_STATUS_CONNECTED, + telepathy.CONNECTION_STATUS_REASON_REQUESTED + ) + if self.__connection is not None: + self.__connectionEventId = self.__connection.connect("connection-event", self._on_connection_change) @gtk_toolbox.log_exception(_moduleLogger) def Disconnect(self): @@ -155,24 +183,14 @@ class TheOneRingConnection( For org.freedesktop.telepathy.Connection @bug Not properly logging out. Cookie files need to be per connection and removed """ - _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") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) - self.manager.disconnected(self) + try: + self._disconnect() + except Exception: + _moduleLogger.exception("Error durring disconnect") @gtk_toolbox.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): @@ -193,7 +211,7 @@ class TheOneRingConnection( # HACK Newer python-telepathy self._validate_handle(props) - chan = self._channelManager.channel_for_props(props, signal=True) + chan = self.__channelManager.channel_for_props(props, signal=True) path = chan._object_path _moduleLogger.info("RequestChannel Object Path: %s" % path) return path @@ -241,14 +259,53 @@ class TheOneRingConnection( return props - @gobject_utils.async + def _disconnect(self): + _moduleLogger.info("Disconnecting") + self.session.voicemails.updateSignalHandler.unregister_sink( + self.__callback + ) + self.session.texts.updateSignalHandler.unregister_sink( + self.__callback + ) + self.__callback = None + + self.__channelManager.close() + self.session.logout() + self.session.close() + self.__session = None + if self.__connection is not None: + self.__connection.disconnect(self.__connectionEventId) + self.__connectionEventId = None + + self.manager.disconnected(self) + _moduleLogger.info("Disconnected") + @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, )) + _moduleLogger.debug("Incoming messages from: %r" % (conversationIds, )) 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 props = self._generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False) - channel = self._channelManager.channel_for_props(props, signal=True) + channel = self.__channelManager.channel_for_props(props, signal=True) + + @gtk_toolbox.log_exception(_moduleLogger) + def _on_connection_change(self, connection, event): + """ + @note Maemo specific + """ + status = event.get_status() + error = event.get_error() + iap_id = event.get_iap_id() + bearer = event.get_bearer_type() + + if status == conic.STATUS_DISCONNECTED: + _moduleLogger.info("Disconnecting due to loss of network connection") + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR + ) + try: + self._disconnect() + except Exception: + _moduleLogger.exception("Error durring disconnect")