import telepathy
import constants
+import util.go_utils as gobject_utils
+import util.coroutines as coroutines
import gtk_toolbox
import gvoice
import handle
):
# Overriding a base class variable
+ # Should the forwarding number be handled by the alias or by an option?
_mandatory_parameters = {
'username' : 's',
'password' : 's',
}
def __init__(self, manager, parameters):
+ self.check_parameters(parameters)
try:
- self.check_parameters(parameters)
account = unicode(parameters['username'])
# Connection init must come first
self._callbackNumber = parameters['forward'].encode('utf-8')
self._channelManager = channel_manager.ChannelManager(self)
- cookieFilePath = "%s/cookies.txt" % constants._data_path_
+ cookieFilePath = None
self._session = gvoice.session.Session(cookieFilePath)
self.set_self_handle(handle.create_handle(self, 'connection'))
telepathy.CONNECTION_STATUS_REASON_REQUESTED
)
try:
+ self.session.conversations.updateSignalHandler.register_sink(
+ self._on_conversations_updated
+ )
self.session.login(*self._credentials)
self.session.backend.set_callback_number(self._callbackNumber)
except gvoice.backend.NetworkError, e:
"""
_moduleLogger.info("Disconnecting")
try:
+ self.session.conversations.updateSignalHandler.unregister_sink(
+ self._on_conversations_updated
+ )
+ self._channelManager.close()
self.session.logout()
_moduleLogger.info("Disconnected")
except Exception:
return handles
def _create_contact_handle(self, requestedHandleName):
- """
- @todo Determine if nay of this is really needed
- """
requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
requestedHandleName
)
h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
return h
- def _on_invite_text(self, contactId):
- """
- @todo Make this work
- """
- h = self._create_contact_handle(contactId)
-
+ @coroutines.func_sink
+ @coroutines.expand_positional
+ @gobject_utils.async
+ @gtk_toolbox.log_exception(_moduleLogger)
+ def _on_conversations_updated(self, conversationIds):
+ # @todo get conversations update running
+ # @todo test conversatiuons
+ _moduleLogger.info("Incoming messages from: %r" % (conversationIds, ))
channelManager = self._channelManager
- channel = channelManager.channel_for_text(handle)
+ for contactId, phoneNumber in conversationIds:
+ h = self._create_contact_handle(contactId, phoneNumber)
+ # if its new, __init__ will take care of things
+ # if its old, its own update will take care of it
+ channel = channelManager.channel_for_text(handle)