Forcing calls to quit immediately rather than giving time to cancel to fix issues...

[theonering] / src / connection.py

diff --git a/src/connection.py b/src/connection.py
index 41c0a6d..71e3920 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -103,14 +103,8 @@ class TheOneRingConnection(
 
                # Connection init must come first
                self.__options = TheOneRingOptions(parameters)
-               self.__session = gvoice.session.Session(
-                       cookiePath = os.path.join(constants._data_path_, "%s.cookies" % account),
-                       defaults = {
-                               "contacts": (self.__options.contactsPollPeriodInHours, "hours"),
-                               "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
-                               "texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
-                       },
-               )
+               self.__accountName = account
+               self.__session = None
                tp.Connection.__init__(
                        self,
                        constants._telepathy_protocol_name_,
@@ -197,6 +191,15 @@ class TheOneRingConnection(
 
                return h
 
+       def force_log_display(self):
+               accountNumber = misc_utils.normalize_number(self.session.backend.get_account_number())
+               debugHandle = self.get_handle_by_name(
+                       telepathy.HANDLE_TYPE_CONTACT,
+                       accountNumber,
+               )
+               debugPromptProps = self.generate_props(telepathy.CHANNEL_TYPE_TEXT, debugHandle, False)
+               self.__channelManager.channel_for_props(debugPromptProps, signal=True)
+
        def log_to_user(self, component, message):
                for logger in self._loggers:
                        logger.log_message(component, message)
@@ -216,6 +219,16 @@ class TheOneRingConnection(
                """
                For org.freedesktop.telepathy.Connection
                """
+               if self.__session is None:
+                       self.__session = gvoice.session.Session(
+                               cookiePath = os.path.join(constants._data_path_, "%s.cookies" % self.__accountName),
+                               defaults = {
+                                       "contacts": (self.__options.contactsPollPeriodInHours, "hours"),
+                                       "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
+                                       "texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
+                               },
+                       )
+
                if self._status != telepathy.CONNECTION_STATUS_DISCONNECTED:
                        _moduleLogger.info("Attempting connect when not disconnected")
                        return
@@ -236,7 +249,7 @@ class TheOneRingConnection(
        def _on_login(self, *args):
                _moduleLogger.info("Connected, setting up...")
                try:
-                       self.__session.load(self.__cachePath)
+                       self.session.load(self.__cachePath)
 
                        for plumber in self._plumbing:
                                plumber.start()
@@ -250,9 +263,6 @@ class TheOneRingConnection(
                        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 Exception:
                        _moduleLogger.exception("Setup failed")
                        self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED)