diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-02-10 14:29:09 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-02-11 16:28:43 -0300 |
| commit | 29902330067f564185d7b57a864be2099f8ea2e8 (patch) | |
| tree | 761a9bad8b1d7cc5de9bd8526ad7536e378d4a88 /src/leap/bitmask/crypto/srpauth.py | |
| parent | 706a3cfe7806baed2d382acf8eb7358ef399b924 (diff) | |
Properly handle defer cancelling.
- Fix issues related to "Cancel login does not work".
- Move srpauth errback to mainwindow.
- Add signal for provider setup cancel.
- Add support to cancel the soledad defer.
[Closes #4869]
[Closes #4973]
Diffstat (limited to 'src/leap/bitmask/crypto/srpauth.py')
| -rw-r--r-- | src/leap/bitmask/crypto/srpauth.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py index bdd38db2..1fb7b774 100644 --- a/src/leap/bitmask/crypto/srpauth.py +++ b/src/leap/bitmask/crypto/srpauth.py @@ -655,7 +655,6 @@ class SRPAuth(QtCore.QObject): username = username.lower() d = self.__instance.authenticate(username, password) d.addCallback(self._gui_notify) - d.addErrback(self._errback) return d def change_password(self, current_password, new_password): @@ -695,18 +694,6 @@ class SRPAuth(QtCore.QObject): logger.debug("Successful login!") self.authentication_finished.emit(True, self.tr("Succeeded")) - def _errback(self, failure): - """ - General errback for the whole login process. Will notify the - UI with the proper signal. - - :param failure: Failure object captured from a callback. - :type failure: twisted.python.failure.Failure - """ - logger.error("Error logging in %s" % (failure,)) - self.authentication_finished.emit(False, "%s" % (failure.value,)) - failure.trap(Exception) - def get_session_id(self): return self.__instance.get_session_id() |