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
import presence
import capabilities
+import autogv
import channel_manager
useGVContacts = True
+ assert gvoice.session.Session._DEFAULTS["contacts"][1] == "hours"
+ contactsPollPeriodInHours = gvoice.session.Session._DEFAULTS["contacts"][0]
+
+ assert gvoice.session.Session._DEFAULTS["voicemail"][1] == "minutes"
+ voicemailPollPeriodInMinutes = gvoice.session.Session._DEFAULTS["voicemail"][0]
+
+ assert gvoice.session.Session._DEFAULTS["texts"][1] == "minutes"
+ textsPollPeriodInMinutes = gvoice.session.Session._DEFAULTS["texts"][0]
+
def __init__(self, parameters = None):
if parameters is None:
return
self.useGVContacts = parameters["use-gv-contacts"]
+ self.contactsPollPeriodInHours = parameters['contacts-poll-period-in-hours']
+ self.voicemailPollPeriodInMinutes = parameters['voicemail-poll-period-in-minutes']
+ self.textsPollPeriodInMinutes = parameters['texts-poll-period-in-minutes']
class TheOneRingConnection(
# overiding base class variable
_mandatory_parameters = {
- 'account' : 's',
- 'password' : 's',
+ 'account': 's',
+ 'password': 's',
}
# overiding base class variable
_optional_parameters = {
- 'forward' : 's',
- 'use-gv-contacts' : 'b',
+ 'forward': 's',
+ 'use-gv-contacts': 'b',
+ 'contacts-poll-period-in-hours': 'i',
+ 'voicemail-poll-period-in-minutes': 'i',
+ 'texts-poll-period-in-minutes': 'i',
}
_parameter_defaults = {
- 'forward' : '',
- 'use-gv-contacts' : TheOneRingOptions.useGVContacts,
+ 'forward': '',
+ 'use-gv-contacts': TheOneRingOptions.useGVContacts,
+ 'contacts-poll-period-in-hours': TheOneRingOptions.contactsPollPeriodInHours,
+ 'voicemail-poll-period-in-minutes': TheOneRingOptions.voicemailPollPeriodInMinutes,
+ 'texts-poll-period-in-minutes': TheOneRingOptions.textsPollPeriodInMinutes,
}
_secret_parameters = set((
"password",
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_,
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)
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
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(
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")
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):
For org.freedesktop.telepathy.Connection
"""
try:
- self._disconnect()
+ self.disconnect()
except Exception:
_moduleLogger.exception("Error durring disconnect")
self.StatusChanged(
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)
_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 = {
return props
- def _disconnect(self):
+ def disconnect(self):
_moduleLogger.info("Disconnecting")
- self.session.voicemails.updateSignalHandler.unregister_sink(
- self.__callback
- )
- self.session.texts.updateSignalHandler.unregister_sink(
- self.__callback
- )
- self.__callback = None
+ for plumber in self._plumbing:
+ plumber.stop()
self.__channelManager.close()
self.session.save(self.__cachePath)
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, ))
projects / theonering / blobdiff