From 520ffec305f89cd1ee504c24adee9e1bee21c452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 30 May 2014 11:44:33 -0300
Subject: Update EIP UI if it fails to load the config

---
 changes/bug_update_ui_when_fails_at_config |  1 +
 src/leap/bitmask/gui/eip_status.py         | 40 ++++++++++++------------------
 src/leap/bitmask/gui/mainwindow.py         |  1 +
 3 files changed, 18 insertions(+), 24 deletions(-)
 create mode 100644 changes/bug_update_ui_when_fails_at_config

diff --git a/changes/bug_update_ui_when_fails_at_config b/changes/bug_update_ui_when_fails_at_config
new file mode 100644
index 00000000..84f19401
--- /dev/null
+++ b/changes/bug_update_ui_when_fails_at_config
@@ -0,0 +1 @@
+- Update EIP UI if it fails to download the config.
\ No newline at end of file
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index ba041968..e7795083 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -526,6 +526,14 @@ class EIPStatusWidget(QtGui.QWidget):
         self.ui.lblEIPMessage.setText(
             self.tr("Route traffic through: {0}").format(self._provider))
 
+    def aborted(self):
+        """
+        Notify the state machine that EIP was aborted for some reason.
+        """
+        # signal connection_aborted to state machine:
+        qtsigs = self.eipconnection.qtsigs
+        qtsigs.connection_aborted_signal.emit()
+
     #
     # Slots for signals
     #
@@ -544,9 +552,7 @@ class EIPStatusWidget(QtGui.QWidget):
             self.eip_conductor.eip_name)
         self.set_eip_status(eip_status_label, error=True)
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_openvpn_already_running(self):
         self.set_eip_status(
@@ -555,9 +561,7 @@ class EIPStatusWidget(QtGui.QWidget):
             error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_alien_openvpn_already_running(self):
         self.set_eip_status(
@@ -567,9 +571,7 @@ class EIPStatusWidget(QtGui.QWidget):
             error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_openvpn_not_found_error(self):
         self.set_eip_status(
@@ -577,9 +579,7 @@ class EIPStatusWidget(QtGui.QWidget):
             error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_vpn_launcher_exception(self):
         # XXX We should implement again translatable exceptions so
@@ -587,9 +587,7 @@ class EIPStatusWidget(QtGui.QWidget):
         self.set_eip_status("VPN Launcher error.", error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_no_polkit_agent_error(self):
         self.set_eip_status(
@@ -602,9 +600,7 @@ class EIPStatusWidget(QtGui.QWidget):
             error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_no_pkexec_error(self):
         self.set_eip_status(
@@ -612,9 +608,7 @@ class EIPStatusWidget(QtGui.QWidget):
             error=True)
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     def _on_eip_no_tun_kext_error(self):
         self.set_eip_status(
@@ -623,9 +617,7 @@ class EIPStatusWidget(QtGui.QWidget):
                     "system.").format(self.eip_conductor.eip_name))
         self.set_eipstatus_off()
 
-        # signal connection_aborted to state machine:
-        qtsigs = self.eipconnection.qtsigs
-        qtsigs.connection_aborted_signal.emit()
+        self.aborted()
 
     @QtCore.Slot()
     def _on_eip_network_unreachable(self):
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index a0eb84a2..5420eb4d 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1624,6 +1624,7 @@ class MainWindow(QtGui.QMainWindow):
                 self.tr("Unable to connect: Problem with provider"))
             logger.error(data[self._backend.ERROR_KEY])
             self._already_started_eip = False
+            self._eip_status.aborted()
 
     # end of EIP methods ---------------------------------------------
 
-- 
cgit v1.2.3