X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=73ec4a4f754657c320e39929c8cc3689b8f516f2;hp=1c3eb21030a5b6bb5e2561be479dff59c4e06ffa;hb=ac08a8171fb00beff39b5f5268b768fd4a85773d;hpb=6e7e1559eabca4b53fd3ced12acc83c7a82074d9 diff --git a/src/connection.py b/src/connection.py index 1c3eb21..73ec4a4 100644 --- a/src/connection.py +++ b/src/connection.py @@ -4,15 +4,8 @@ import logging import telepathy -try: - import conic as _conic - conic = _conic -except (ImportError, OSError): - conic = None - import constants import tp -import util.coroutines as coroutines import util.misc as util_misc import gtk_toolbox @@ -26,6 +19,7 @@ import simple_presence import presence import capabilities +import autogv import channel_manager @@ -73,9 +67,9 @@ class TheOneRingConnection( _optional_parameters = { 'forward': 's', 'use-gv-contacts': 'b', - 'contacts-poll-period': 'i', - 'voicemail-poll-period': 'i', - 'texts-poll-period': 'i', + 'contacts-poll-period-in-hours': 'i', + 'voicemail-poll-period-in-minutes': 'i', + 'texts-poll-period-in-minutes': 'i', } _parameter_defaults = { 'forward': '', @@ -99,8 +93,15 @@ class TheOneRingConnection( raise telepathy.errors.InvalidArgument("Invalid forwarding number") # Connection init must come first - self.__session = gvoice.session.Session(None) self.__options = TheOneRingOptions(parameters) + self.__session = gvoice.session.Session( + cookiePath = None, + defaults = { + "contacts": (self.__options.contactsPollPeriodInHours, "hours"), + "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"), + "texts": (self.__options.textsPollPeriodInMinutes, "minutes"), + }, + ) tp.Connection.__init__( self, constants._telepathy_protocol_name_, @@ -122,10 +123,6 @@ class TheOneRingConnection( self.__callbackNumberParameter = encodedCallback self.__channelManager = channel_manager.ChannelManager(self) - if conic is not None: - self.__connection = conic.Connection() - else: - self.__connection = None self.__cachePath = os.sep.join((constants._data_path_, "cache", self.username)) try: os.makedirs(self.__cachePath) @@ -134,8 +131,12 @@ class TheOneRingConnection( raise self.set_self_handle(handle.create_handle(self, 'connection')) + self._plumbing = [ + autogv.NewGVConversations(weakref.ref(self)), + autogv.RefreshVoicemail(weakref.ref(self)), + autogv.AutoDisconnect(weakref.ref(self)), + ] - self.__callback = None _moduleLogger.info("Connection to the account %s created" % account) @property @@ -188,17 +189,8 @@ class TheOneRingConnection( try: self.__session.load(self.__cachePath) - self.__callback = coroutines.func_sink( - coroutines.expand_positional( - self._on_conversations_updated - ) - ) - self.session.voicemails.updateSignalHandler.register_sink( - self.__callback - ) - self.session.texts.updateSignalHandler.register_sink( - self.__callback - ) + for plumber in self._plumbing: + plumber.start() self.session.login(*self.__credentials) if not self.__callbackNumberParameter: callback = gvoice.backend.get_sane_callback( @@ -208,24 +200,18 @@ class TheOneRingConnection( 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) + 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) + 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( - telepathy.CONNECTION_STATUS_DISCONNECTED, - telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR - ) + self.disconnect(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 - ) + self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED) return _moduleLogger.info("Connected") @@ -233,8 +219,6 @@ class TheOneRingConnection( 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): @@ -242,13 +226,9 @@ class TheOneRingConnection( For org.freedesktop.telepathy.Connection """ try: - self._disconnect() + self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED) except Exception: _moduleLogger.exception("Error durring disconnect") - self.StatusChanged( - telepathy.CONNECTION_STATUS_DISCONNECTED, - telepathy.CONNECTION_STATUS_REASON_REQUESTED - ) @gtk_toolbox.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): @@ -264,7 +244,7 @@ class TheOneRingConnection( self.check_handle(handleType, handleId) h = self.get_handle_by_id(handleType, handleId) if handleId != 0 else None - props = self._generate_props(type, h, suppressHandler) + props = self.generate_props(type, h, suppressHandler) self._validate_handle(props) chan = self.__channelManager.channel_for_props(props, signal=True) @@ -272,7 +252,7 @@ class TheOneRingConnection( _moduleLogger.info("RequestChannel Object Path (%s): %s" % (type.rsplit(".", 1)[-1], path)) return path - def _generate_props(self, channelType, handle, suppressHandler, initiatorHandle=None): + 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() props = { @@ -287,15 +267,17 @@ class TheOneRingConnection( return props - def _disconnect(self): + def disconnect(self, reason): _moduleLogger.info("Disconnecting") - self.session.voicemails.updateSignalHandler.unregister_sink( - self.__callback - ) - self.session.texts.updateSignalHandler.unregister_sink( - self.__callback + # Not having the disconnect first can cause weird behavior with clients + # including not being able to reconnect or even crashing + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + reason, ) - self.__callback = None + + for plumber in self._plumbing: + plumber.stop() self.__channelManager.close() self.session.save(self.__cachePath) @@ -304,52 +286,3 @@ class TheOneRingConnection( self.manager.disconnected(self) _moduleLogger.info("Disconnected") - - @gtk_toolbox.log_exception(_moduleLogger) - def _on_conversations_updated(self, conv, conversationIds): - _moduleLogger.debug("Incoming messages from: %r" % (conversationIds, )) - 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) - 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 - """ - 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() - 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") - else: - _moduleLogger.info("Other status: %r" % (status, ))