"""
@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
+@todo Decide if we should do what the spec suggests and hold onto a singleton contactlist
"""
+import os
import weakref
import logging
conic = None
import constants
+import tp
import util.coroutines as coroutines
+import util.misc as util_misc
import gtk_toolbox
import gvoice
class TheOneRingConnection(
- telepathy.server.Connection,
+ tp.Connection,
requests.RequestsMixin,
contacts.ContactsMixin,
aliasing.AliasingMixin,
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):
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,
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'))
return self.__credentials[0]
@property
- def userAliasType(self):
- return self.USER_ALIAS_ACCOUNT
-
- def handle(self, handleType, handleId):
- self.check_handle(handleType, handleId)
- return self._handles[handleType, handleId]
+ 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
@property
def _channel_manager(self):
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(
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)
except gvoice.backend.NetworkError, e:
_moduleLogger.exception("Connection Failed")
self.StatusChanged(
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,
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)
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()
self.__callback = None
self.__channelManager.close()
+ self.session.save(self.__cachePath)
self.session.logout()
self.session.close()
self.__session = None
@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)
+ 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
"""
status = event.get_status()
error = event.get_error()
self._disconnect()
except Exception:
_moduleLogger.exception("Error durring disconnect")
+ else:
+ _moduleLogger.info("Other status: %r" % (status, ))
projects / theonering / blobdiff