diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-09-30 16:29:30 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-09-30 16:29:30 -0300 |
| commit | fb453925ff45ff37e58f41c1877c2069f4f58f89 (patch) | |
| tree | fe3275d27a13872e236bd6adb853fe0c1b10416b /src/leap/bitmask/gui | |
| parent | 66c486a534b5ecd2178e096bea3b300971f59b5b (diff) | |
| parent | decae946e725ce5275f8035e33a9d6adb69b3342 (diff) | |
Merge remote-tracking branch 'kali/feature/soledad_boostrap_error_handling' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index e74258a8..92d6906e 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -234,6 +234,8 @@ class MainWindow(QtGui.QMainWindow): self._soledad_bootstrapped_stage) self._soledad_bootstrapper.soledad_timeout.connect( self._retry_soledad_connection) + # XXX missing connect to soledad_failed (signal unrecoverable to user) + # TODO wait until chiiph ui refactor. self._smtp_bootstrapper = SMTPBootstrapper() self._smtp_bootstrapper.download_config.connect( @@ -1007,6 +1009,7 @@ class MainWindow(QtGui.QMainWindow): """ Retries soledad connection. """ + # XXX should move logic to soledad boostrapper itself logger.debug("Retrying soledad connection.") if self._soledad_bootstrapper.should_retry_initialization(): self._soledad_bootstrapper.increment_retries_count() @@ -1031,8 +1034,9 @@ class MainWindow(QtGui.QMainWindow): """ passed = data[self._soledad_bootstrapper.PASSED_KEY] if not passed: + # TODO should actually *display* on the panel. logger.debug("ERROR on soledad bootstrapping:") - logger.error(data[self._soledad_bootstrapper.ERROR_KEY]) + logger.error("%r" % data[self._soledad_bootstrapper.ERROR_KEY]) return else: logger.debug("Done bootstrapping Soledad") |