X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fconnection.py;h=e94e0b8c3e1f83ab7290e1411e56d889c5746f91;hb=b5952a89cc8688e13329c9b6198a8b8498167208;hp=9f1d7a210da242f24acf7a0a88201018572a3cd4;hpb=554963ff8e04cd0078b3721bd7f8cde1cc8df613;p=theonering diff --git a/src/connection.py b/src/connection.py index 9f1d7a2..e94e0b8 100644 --- a/src/connection.py +++ b/src/connection.py @@ -1,13 +1,12 @@ """ @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 """ +import os import weakref import logging @@ -20,13 +19,15 @@ except (ImportError, OSError): conic = None import constants -import util.go_utils as gobject_utils +import tp import util.coroutines as coroutines +import util.misc as util_misc import gtk_toolbox import gvoice import handle +import requests import contacts import aliasing import simple_presence @@ -40,27 +41,30 @@ _moduleLogger = logging.getLogger("connection") class TheOneRingConnection( - telepathy.server.Connection, - telepathy.server.ConnectionInterfaceRequests, # already a mixin - #contacts.ContactsMixin, + tp.Connection, + requests.RequestsMixin, + contacts.ContactsMixin, 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? + # overiding base class variable _mandatory_parameters = { 'account' : 's', 'password' : 's', - 'forward' : '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): @@ -68,19 +72,20 @@ class TheOneRingConnection( account = unicode(parameters['account']) encodedAccount = parameters['account'].encode('utf-8') encodedPassword = parameters['password'].encode('utf-8') - encodedCallback = parameters['forward'].encode('utf-8') - if not encodedCallback: - raise telepathy.errors.InvalidArgument("User must specify what number GV forwards calls to") + encodedCallback = util_misc.normalize_number(parameters['forward'].encode('utf-8')) + if encodedCallback and not util_misc.is_valid_number(encodedCallback): + raise telepathy.errors.InvalidArgument("Invalid forwarding number") # Connection init must come first - telepathy.server.Connection.__init__( + self.__session = gvoice.session.Session(None) + tp.Connection.__init__( self, constants._telepathy_protocol_name_, account, constants._telepathy_implementation_name_ ) - telepathy.server.ConnectionInterfaceRequests.__init__(self) - #contacts.ContactsMixin.__init__(self) + requests.RequestsMixin.__init__(self) + contacts.ContactsMixin.__init__(self) aliasing.AliasingMixin.__init__(self) simple_presence.SimplePresenceMixin.__init__(self) presence.PresenceMixin.__init__(self) @@ -91,16 +96,19 @@ class TheOneRingConnection( encodedAccount, encodedPassword, ) - self.__callbackNumber = encodedCallback + 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 else: self.__connection = None - self.__connectionEventId = None + self.__cachePath = os.sep.join((constants._data_path_, "cache", self.username)) + try: + os.makedirs(self.__cachePath) + except OSError, e: + if e.errno != 17: + raise self.set_self_handle(handle.create_handle(self, 'connection')) @@ -120,12 +128,25 @@ class TheOneRingConnection( return self.__credentials[0] @property - def userAliasType(self): - return self.USER_ALIAS_ACCOUNT + def callbackNumberParameter(self): + return self.__callbackNumberParameter + + def get_handle_by_name(self, handleType, handleName): + requestedHandleName = handleName.encode('utf-8') + if handleType == telepathy.HANDLE_TYPE_CONTACT: + _moduleLogger.info("get_handle_by_name Contact: %s" % requestedHandleName) + 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) + h = handle.create_handle(self, 'list', requestedHandleName) + else: + raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType) + return h - def handle(self, handleType, handleId): - self.check_handle(handleType, handleId) - return self._handles[handleType, handleId] + @property + def _channel_manager(self): + return self.__channelManager @gtk_toolbox.log_exception(_moduleLogger) def Connect(self): @@ -138,8 +159,7 @@ 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( coroutines.expand_positional( @@ -153,7 +173,19 @@ class TheOneRingConnection( self.__callback ) self.session.login(*self.__credentials) - self.session.backend.set_callback_number(self.__callbackNumber) + if not self.__callbackNumberParameter: + callback = gvoice.backend.get_sane_callback( + self.session.backend + ) + self.__callbackNumberParameter = util_misc.normalize_number(callback) + self.session.backend.set_callback_number(self.__callbackNumberParameter) + + subscribeHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "subscribe") + subscribeProps = self._generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, subscribeHandle, False) + self.__channelManager.channel_for_props(subscribeProps, signal=True) + publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish") + publishProps = self._generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False) + self.__channelManager.channel_for_props(publishProps, signal=True) except gvoice.backend.NetworkError, e: _moduleLogger.exception("Connection Failed") self.StatusChanged( @@ -181,7 +213,6 @@ class TheOneRingConnection( def Disconnect(self): """ For org.freedesktop.telepathy.Connection - @bug Not properly logging out. Cookie files need to be per connection and removed """ self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, @@ -205,45 +236,15 @@ class TheOneRingConnection( self.check_connected() self.check_handle(handleType, handleId) - h = self.handle(handleType, handleId) if handleId != 0 else None + h = self.get_handle_by_id(handleType, handleId) if handleId != 0 else None props = self._generate_props(type, h, suppressHandler) - if hasattr(self, "_validate_handle"): - # HACK Newer python-telepathy - self._validate_handle(props) + self._validate_handle(props) chan = self.__channelManager.channel_for_props(props, signal=True) path = chan._object_path - _moduleLogger.info("RequestChannel Object Path: %s" % path) + _moduleLogger.info("RequestChannel Object Path (%s): %s" % (type.rsplit(".", 1)[-1], path)) return path - @gtk_toolbox.log_exception(_moduleLogger) - def RequestHandles(self, handleType, names, sender): - """ - For org.freedesktop.telepathy.Connection - Overiding telepathy.server.Connecton to allow custom handles - """ - self.check_connected() - self.check_handle_type(handleType) - - handles = [] - for name in names: - requestedHandleName = name.encode('utf-8') - if handleType == telepathy.HANDLE_TYPE_CONTACT: - _moduleLogger.info("RequestHandles Contact: %s" % requestedHandleName) - requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name( - requestedHandleName - ) - h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber) - elif handleType == telepathy.HANDLE_TYPE_LIST: - # Support only server side (immutable) lists - _moduleLogger.info("RequestHandles List: %s" % requestedHandleName) - h = handle.create_handle(self, 'list', requestedHandleName) - else: - raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType) - handles.append(h.id) - self.add_client_handle(h, sender) - return handles - def _generate_props(self, channelType, handle, suppressHandler, initiatorHandle=None): targetHandle = 0 if handle is None else handle.get_id() targetHandleType = telepathy.HANDLE_TYPE_NONE if handle is None else handle.get_type() @@ -270,12 +271,9 @@ class TheOneRingConnection( self.__callback = None self.__channelManager.close() + self.session.save(self.__cachePath) 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") @@ -283,17 +281,36 @@ 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: - h = handle.create_handle(self, 'contact', contactId, phoneNumber) + 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) - channel = self.__channelManager.channel_for_props(props, signal=True) + if self.__channelManager.channel_exists(props): + continue + + # Maemo 4.1's RTComm opens a window for a chat regardless if a + # message is received or not, so we need to do some filtering here + mergedConv = conv.get_conversation(phoneNumber) + unreadConvs = [ + conversation + for conversation in mergedConv.conversations + if not conversation.isRead and not conversation.isArchived + ] + if not unreadConvs: + continue + + chan = self.__channelManager.channel_for_props(props, signal=True) @gtk_toolbox.log_exception(_moduleLogger) def _on_connection_change(self, connection, event): """ @note Maemo specific + + @todo Make this delayed to handle background switching of networks. First I need to verify I receive connected """ + if not self.session.is_logged_in(): + _moduleLogger.info("Received connection change event when not logged in") + return status = event.get_status() error = event.get_error() iap_id = event.get_iap_id() @@ -309,3 +326,5 @@ class TheOneRingConnection( self._disconnect() except Exception: _moduleLogger.exception("Error durring disconnect") + else: + _moduleLogger.info("Other status: %r" % (status, ))