From 21e8d1a4539b0b0837ca0763de4974ac6f216bf7 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 17 Mar 2014 13:21:51 -0300
Subject: Catch soledad invalid token error (#5191).

---
 src/leap/bitmask/gui/mail_status.py | 38 ++++++++++++++++++++++++++++++-------
 src/leap/bitmask/gui/mainwindow.py  |  2 ++
 2 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'src/leap/bitmask/gui')

diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index 8da26f6d..44a138e2 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -112,6 +112,10 @@ class MailStatusWidget(QtGui.QWidget):
                  callback=self._mail_handle_imap_events,
                  reqcbk=lambda req, resp: None)
 
+        register(signal=proto.SOLEDAD_INVALID_AUTH_TOKEN,
+                 callback=self.set_soledad_invalid_auth_token,
+                 reqcbk=lambda req, resp: None)
+
         self._soledad_event.connect(
             self._mail_handle_soledad_events_slot)
         self._imap_event.connect(
@@ -191,6 +195,17 @@ class MailStatusWidget(QtGui.QWidget):
         msg = self.tr("There was an unexpected problem with Soledad.")
         self._set_mail_status(msg, ready=-1)
 
+    def set_soledad_invalid_auth_token(self):
+        """
+        SLOT
+        TRIGGER:
+            SoledadBootstrapper.soledad_invalid_token
+
+        This method is called when the auth token is invalid
+        """
+        msg = self.tr("Invalid auth token, try logging in again.")
+        self._set_mail_status(msg, ready=-1)
+
     def _set_mail_status(self, status, ready=0):
         """
         Sets the Mail status in the label and in the tray icon.
@@ -384,7 +399,7 @@ class MailStatusWidget(QtGui.QWidget):
 
     def about_to_start(self):
         """
-        Displays the correct UI for the point where mail components
+        Display the correct UI for the point where mail components
         haven't really started, but they are about to in a second.
         """
         self._set_mail_status(self.tr("About to start, please wait..."),
@@ -392,7 +407,7 @@ class MailStatusWidget(QtGui.QWidget):
 
     def set_disabled(self):
         """
-        Displays the correct UI for disabled mail.
+        Display the correct UI for disabled mail.
         """
         self._set_mail_status(self.tr("Disabled"), -1)
 
@@ -403,7 +418,7 @@ class MailStatusWidget(QtGui.QWidget):
     @QtCore.Slot()
     def mail_state_disconnected(self):
         """
-        Displays the correct UI for the disconnected state.
+        Display the correct UI for the disconnected state.
         """
         # XXX this should handle the disabled state better.
         self._started = False
@@ -415,7 +430,7 @@ class MailStatusWidget(QtGui.QWidget):
     @QtCore.Slot()
     def mail_state_connecting(self):
         """
-        Displays the correct UI for the connecting state.
+        Display the correct UI for the connecting state.
         """
         self._disabled = False
         self._started = True
@@ -424,23 +439,32 @@ class MailStatusWidget(QtGui.QWidget):
     @QtCore.Slot()
     def mail_state_disconnecting(self):
         """
-        Displays the correct UI for the connecting state.
+        Display the correct UI for the connecting state.
         """
         self._set_mail_status(self.tr("Disconnecting..."), 1)
 
     @QtCore.Slot()
     def mail_state_connected(self):
         """
-        Displays the correct UI for the connected state.
+        Display the correct UI for the connected state.
         """
         self._set_mail_status(self.tr("ON"), 2)
 
     @QtCore.Slot()
     def mail_state_disabled(self):
         """
-        Displays the correct UI for the disabled state.
+        Display the correct UI for the disabled state.
         """
         self._disabled = True
         status = self.tr("You must be logged in to use {0}.").format(
             self._service_name)
         self._set_mail_status(status, -1)
+
+    @QtCore.Slot()
+    def soledad_invalid_auth_token(self):
+        """
+        Display the correct UI for the invalid token state
+        """
+        self._disabled = True
+        status = self.tr("Invalid auth token, try logging in again.")
+        self._set_mail_status(status, -1)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 758bff4e..e4e71dcc 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -262,6 +262,8 @@ class MainWindow(QtGui.QMainWindow):
             self._soledad_bootstrapped_stage)
         self._soledad_bootstrapper.soledad_timeout.connect(
             self._retry_soledad_connection)
+        self._soledad_bootstrapper.soledad_invalid_auth_token.connect(
+            self._mail_status.set_soledad_invalid_auth_token)
         self._soledad_bootstrapper.soledad_failed.connect(
             self._mail_status.set_soledad_failed)
 
-- 
cgit v1.2.3