import constants
import tp
-import util.misc as util_misc
-import gtk_toolbox
+import util.go_utils as gobject_utils
+import util.misc as misc_utils
import gvoice
import handle
-import requests
-import contacts
import aliasing
-import simple_presence
-import presence
+import avatars
import capabilities
+import contacts
+import presence
+import requests
+import simple_presence
import autogv
import channel_manager
-_moduleLogger = logging.getLogger("connection")
+_moduleLogger = logging.getLogger(__name__)
class TheOneRingOptions(object):
class TheOneRingConnection(
tp.Connection,
- requests.RequestsMixin,
- contacts.ContactsMixin,
aliasing.AliasingMixin,
- simple_presence.SimplePresenceMixin,
- presence.PresenceMixin,
+ avatars.AvatarsMixin,
capabilities.CapabilitiesMixin,
+ contacts.ContactsMixin,
+ presence.PresenceMixin,
+ requests.RequestsMixin,
+ simple_presence.SimplePresenceMixin,
):
# overiding base class variable
"password",
))
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def __init__(self, manager, parameters):
self.check_parameters(parameters)
account = unicode(parameters['account'])
encodedAccount = parameters['account'].encode('utf-8')
encodedPassword = parameters['password'].encode('utf-8')
- encodedCallback = util_misc.normalize_number(parameters['forward'].encode('utf-8'))
- if encodedCallback and not util_misc.is_valid_number(encodedCallback):
+ encodedCallback = misc_utils.normalize_number(parameters['forward'].encode('utf-8'))
+ if encodedCallback and not misc_utils.is_valid_number(encodedCallback):
raise telepathy.errors.InvalidArgument("Invalid forwarding number")
# Connection init must come first
account,
constants._telepathy_implementation_name_
)
- requests.RequestsMixin.__init__(self)
- contacts.ContactsMixin.__init__(self)
aliasing.AliasingMixin.__init__(self)
- simple_presence.SimplePresenceMixin.__init__(self)
- presence.PresenceMixin.__init__(self)
+ avatars.AvatarsMixin.__init__(self)
capabilities.CapabilitiesMixin.__init__(self)
+ contacts.ContactsMixin.__init__(self)
+ presence.PresenceMixin.__init__(self)
+ requests.RequestsMixin.__init__(self)
+ simple_presence.SimplePresenceMixin.__init__(self)
self.__manager = weakref.proxy(manager)
self.__credentials = (
autogv.NewGVConversations(weakref.ref(self)),
autogv.RefreshVoicemail(weakref.ref(self)),
autogv.AutoDisconnect(weakref.ref(self)),
+ autogv.DelayEnableContactIntegration(constants._telepathy_implementation_name_),
]
+ self._delayedConnect = gobject_utils.Async(self._delayed_connect)
_moduleLogger.info("Connection to the account %s created" % account)
+ self._timedDisconnect = autogv.TimedDisconnect(weakref.ref(self))
+ self._timedDisconnect.start()
@property
def manager(self):
def get_handle_by_name(self, handleType, handleName):
requestedHandleName = handleName.encode('utf-8')
if handleType == telepathy.HANDLE_TYPE_CONTACT:
- _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.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)
def _channel_manager(self):
return self.__channelManager
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def Connect(self):
"""
For org.freedesktop.telepathy.Connection
"""
+ if self._status != telepathy.CONNECTION_STATUS_DISCONNECTED:
+ _moduleLogger.info("Attempting connect when not disconnected")
+ return
+ _moduleLogger.info("Kicking off connect")
+ self._delayedConnect.start()
+ self._timedDisconnect.stop()
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _delayed_connect(self):
_moduleLogger.info("Connecting...")
self.StatusChanged(
telepathy.CONNECTION_STATUS_CONNECTING,
callback = gvoice.backend.get_sane_callback(
self.session.backend
)
- self.__callbackNumberParameter = util_misc.normalize_number(callback)
+ self.__callbackNumberParameter = misc_utils.normalize_number(callback)
self.session.backend.set_callback_number(self.__callbackNumberParameter)
subscribeHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "subscribe")
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:
+ except gvoice.backend.NetworkError:
_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:
+ except Exception:
_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")
telepathy.CONNECTION_STATUS_REASON_REQUESTED
)
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def Disconnect(self):
"""
For org.freedesktop.telepathy.Connection
"""
- try:
- self.disconnect()
- except Exception:
- _moduleLogger.exception("Error durring disconnect")
- self.StatusChanged(
- telepathy.CONNECTION_STATUS_DISCONNECTED,
- telepathy.CONNECTION_STATUS_REASON_REQUESTED
- )
+ _moduleLogger.info("Kicking off disconnect")
+ self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def RequestChannel(self, type, handleType, handleId, suppressHandler):
"""
For org.freedesktop.telepathy.Connection
_moduleLogger.info("RequestChannel Object Path (%s): %s" % (type.rsplit(".", 1)[-1], path))
return path
- 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()
+ def generate_props(self, channelType, handleObj, suppressHandler, initiatorHandle=None):
+ targetHandle = 0 if handleObj is None else handleObj.get_id()
+ targetHandleType = telepathy.HANDLE_TYPE_NONE if handleObj is None else handleObj.get_type()
props = {
telepathy.CHANNEL_INTERFACE + '.ChannelType': channelType,
telepathy.CHANNEL_INTERFACE + '.TargetHandle': targetHandle,
return props
- def disconnect(self):
+ def disconnect(self, reason):
_moduleLogger.info("Disconnecting")
+
+ self._delayedConnect.cancel()
+ self._timedDisconnect.stop()
+
+ # 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,
+ )
+
for plumber in self._plumbing:
plumber.stop()
self.__channelManager.close()
+ self.manager.disconnected(self)
+
self.session.save(self.__cachePath)
self.session.logout()
self.session.close()
- self.manager.disconnected(self)
_moduleLogger.info("Disconnected")
projects / theonering / blobdiff