diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-18 09:50:09 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-18 09:50:09 -0400 |
| commit | 735111cee1c28ccc07c87d806bc5412aaffcedf7 (patch) | |
| tree | ec2fb7489a4ad8467907aa8ef08e4662b332cd4d | |
| parent | e475daff20a2278ad170cb1ebaf528e7ee4a1657 (diff) | |
| parent | a81ae28db34412c298ececc64319a9cf993c18f3 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/3774_handle-logout-problem' into develop
| -rw-r--r-- | changes/bug-3774_fix-logout-error | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/crypto/srpauth.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 17 |
3 files changed, 13 insertions, 7 deletions
diff --git a/changes/bug-3774_fix-logout-error b/changes/bug-3774_fix-logout-error new file mode 100644 index 00000000..ce0951f0 --- /dev/null +++ b/changes/bug-3774_fix-logout-error @@ -0,0 +1,2 @@ + o Catch logout problem, display a user message and allow log back in after a + successful logout if there was a logout error before. Closes #3774. diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py index 41ce130a..776fb2cc 100644 --- a/src/leap/bitmask/crypto/srpauth.py +++ b/src/leap/bitmask/crypto/srpauth.py @@ -553,6 +553,7 @@ class SRPAuth(QtCore.QObject): except Exception as e: logger.warning("Something went wrong with the logout: %r" % (e,)) + raise else: self.set_session_id(None) self.set_uid(None) diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 98cfacb1..89069151 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1453,13 +1453,16 @@ class MainWindow(QtGui.QMainWindow): Switches the stackedWidget back to the login stage after logging out """ - self._logged_user = None - self.ui.action_log_out.setEnabled(False) - self.ui.stackedWidget.setCurrentIndex(self.LOGIN_INDEX) - self._login_widget.set_password("") - self._login_widget.set_enabled(True) - self._login_widget.set_status("") - self.ui.btnPreferences.setEnabled(False) + if ok: + self._logged_user = None + self.ui.action_log_out.setEnabled(False) + self.ui.stackedWidget.setCurrentIndex(self.LOGIN_INDEX) + self._login_widget.set_password("") + self._login_widget.set_enabled(True) + self._login_widget.set_status("") + else: + status_text = self.tr("Something went wrong with the logout.") + self._status_panel.set_global_status(status_text, error=True) def _intermediate_stage(self, data): """ |