-
-"""
-@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 Decide if we should do what the spec suggests and hold onto a singleton contactlist
-"""
-
-
import os
import weakref
import logging
_moduleLogger = logging.getLogger("connection")
+class TheOneRingOptions(object):
+
+ useGVContacts = True
+
+ def __init__(self, parameters = None):
+ if parameters is None:
+ return
+ self.useGVContacts = parameters["use-gv-contacts"]
+
+
class TheOneRingConnection(
tp.Connection,
requests.RequestsMixin,
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',
}
- # Overriding a base class variable
+ # overiding base class variable
_optional_parameters = {
'forward' : 's',
+ 'use-gv-contacts' : 'b',
}
_parameter_defaults = {
'forward' : '',
+ 'use-gv-contacts' : TheOneRingOptions.useGVContacts,
}
+ _secret_parameters = set((
+ "password",
+ ))
@gtk_toolbox.log_exception(_moduleLogger)
def __init__(self, manager, parameters):
raise telepathy.errors.InvalidArgument("Invalid forwarding number")
# Connection init must come first
+ self.__session = gvoice.session.Session(None)
+ self.__options = TheOneRingOptions(parameters)
tp.Connection.__init__(
self,
constants._telepathy_protocol_name_,
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)
return self.__session
@property
+ def options(self):
+ return self.__options
+
+ @property
def username(self):
return self.__credentials[0]
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)
+ _moduleLogger.debug("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)
+ _moduleLogger.debug("get_handle_by_name List: %s" % requestedHandleName)
h = handle.create_handle(self, 'list', requestedHandleName)
else:
raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
telepathy.CONNECTION_STATUS_REASON_REQUESTED
)
try:
- cookieFilePath = None
- self.__session = gvoice.session.Session(cookieFilePath)
self.__session.load(self.__cachePath)
self.__callback = coroutines.func_sink(
)
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(
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
def _generate_props(self, channelType, handle, suppressHandler, initiatorHandle=None):
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")
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
-
- @todo Make this delayed to handle background switching of networks
"""
+ 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()
self._disconnect()
except Exception:
_moduleLogger.exception("Error durring disconnect")
+ else:
+ _moduleLogger.info("Other status: %r" % (status, ))
projects / theonering / blobdiff