add restore clearnet button. Closes: #5726

2 files changed, 82 insertions, 21 deletions

diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index e7795083..fd8b35c3 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -31,6 +31,7 @@ from leap.common.check import leap_assert_type
 
 from ui_eip_status import Ui_EIPStatus
 
+QtDelayedCall = QtCore.QTimer.singleShot
 logger = logging.getLogger(__name__)
 
 
@@ -66,6 +67,9 @@ class EIPStatusWidget(QtGui.QWidget):
         self._service_name = get_service_display_name(EIP_SERVICE)
 
         self.ui.eip_bandwidth.hide()
+        self.hide_fw_down_button()
+        self.ui.btnFwDown.clicked.connect(
+            self._on_fw_down_button_clicked)
 
         # Set the EIP status icons
         self.CONNECTING_ICON = None
@@ -109,8 +113,12 @@ class EIPStatusWidget(QtGui.QWidget):
 
         signaler.eip_state_changed.connect(self.update_vpn_state)
         signaler.eip_status_changed.connect(self.update_vpn_status)
-        signaler.eip_network_unreachable.connect(
-            self._on_eip_network_unreachable)
+
+        # XXX we cannot connect this signal now because
+        # it interferes with the proper notifications during restarts
+        # without available network.
+        #signaler.eip_network_unreachable.connect(
+            #self._on_eip_network_unreachable)
 
     def _make_status_clickable(self):
         """
@@ -273,6 +281,8 @@ class EIPStatusWidget(QtGui.QWidget):
         Disables the start/stop button.
         """
         self.set_startstop_enabled(False)
+        msg = self.tr("Encrypted Internet is starting")
+        self.set_eip_message(msg)
 
     @QtCore.Slot()
     def disable_eip_start(self):
@@ -314,10 +324,18 @@ class EIPStatusWidget(QtGui.QWidget):
         if self.isVisible():
             self._eip_status_menu.menuAction().setVisible(True)
 
-    # XXX disable (later) --------------------------
+    def set_eip_message(self, message):
+        """
+        Set the EIP Widget main message.
+
+        :param message: the message to set in the widget
+        :type message: str or unicode
+        """
+        self.ui.lblEIPMessage.setText(message)
+
     def set_eip_status(self, status, error=False):
         """
-        Sets the status label at the VPN stage to status
+        Set the status label at the VPN stage to status.
 
         :param status: status message
         :type status: str or unicode
@@ -362,6 +380,26 @@ class EIPStatusWidget(QtGui.QWidget):
         self.ui.btnEipStartStop.clicked.connect(
             self.eipconnection.qtsigs.do_connect_signal)
 
+    def hide_fw_down_button(self):
+        """
+        Hide firewall-down button.
+        """
+        self.ui.btnFwDown.hide()
+
+    def show_fw_down_button(self):
+        """
+        Enable firewall-down button.
+        """
+        self.ui.btnFwDown.show()
+
+    def _on_fw_down_button_clicked(self):
+        """
+        Raise a signal for tearing down the firewall, and hide the button
+        afterwards.
+        """
+        self.eip_conductor._backend.tear_fw_down()
+        QtDelayedCall(50, self.hide_fw_down_button)
+
     @QtCore.Slot(dict)
     def eip_stopped(self, restart=False, failed=False):
         """
@@ -382,7 +420,7 @@ class EIPStatusWidget(QtGui.QWidget):
 
         clear_traffic = self.tr("Traffic is being routed in the clear.")
         unreachable_net = self.tr("Network is unreachable.")
-        failed_msg = self.tr("Cannot start Encrypted Proxy.")
+        failed_msg = self.tr("Cannot start Encrypted Internet")
 
         if restart:
             msg = unreachable_net
@@ -390,18 +428,19 @@ class EIPStatusWidget(QtGui.QWidget):
             msg = failed_msg
         else:
             msg = clear_traffic
-        self.ui.lblEIPMessage.setText(msg)
+        self.set_eip_message(msg)
         self.ui.lblEIPStatus.show()
+        self.show()
 
     def eip_failed_to_restart(self):
         """
         Update EIP messages.
         """
-        msg = self.tr("Could not restart Encrypted Proxy")
+        msg = self.tr("Could not restart Encrypted Internet")
         self.ui.lblEIPMessage.setText(msg)
         self.ui.lblEIPStatus.show()
-
-        self.set_eip_status(self.tr("You can start the service manually."))
+        self.set_eip_status(self.tr("You can launch the service manually."))
+        self.show_fw_down_button()
 
     @QtCore.Slot(dict)
     def update_vpn_status(self, data=None):
@@ -462,10 +501,15 @@ class EIPStatusWidget(QtGui.QWidget):
             # XXX should be handled by the state machine too.
             # --- is this currently being sent?
             self.eipconnection.qtsigs.connected_signal.emit()
+            self._on_eip_connected()
 
         # XXX should lookup vpn_state map in EIPConnection
         elif vpn_state == "AUTH":
             self.set_eip_status(self.tr("Authenticating..."))
+            # we wipe up any previous error info in the EIP message
+            # when we detect vpn authentication is happening
+            msg = self.tr("Encrypted Internet is starting")
+            self.set_eip_message(msg)
         elif vpn_state == "GET_CONFIG":
             self.set_eip_status(self.tr("Retrieving configuration..."))
         elif vpn_state == "WAIT":
@@ -478,10 +522,10 @@ class EIPStatusWidget(QtGui.QWidget):
             # Put the following calls in Qt's event queue, otherwise
             # the UI won't update properly
             #self.send_disconnect_signal()
-            QtCore.QTimer.singleShot(
+            QtDelayedCall(
                 0, self.eipconnection.qtsigns.do_disconnect_signal.emit)
             msg = self.tr("Unable to start VPN, it's already running.")
-            QtCore.QTimer.singleShot(0, partial(self.set_eip_status, msg))
+            QtDelayedCall(0, partial(self.set_eip_status, msg))
         else:
             self.set_eip_status(vpn_state)
 
@@ -524,7 +568,8 @@ class EIPStatusWidget(QtGui.QWidget):
     def set_provider(self, provider):
         self._provider = provider
         self.ui.lblEIPMessage.setText(
-            self.tr("Route traffic through: {0}").format(self._provider))
+            self.tr("Routing traffic through: <b>{0}</b>").format(
+                self._provider))
 
     def aborted(self):
         """
@@ -619,6 +664,13 @@ class EIPStatusWidget(QtGui.QWidget):
 
         self.aborted()
 
+    def _on_eip_connected(self):
+        """
+        Reconnect the disconnecting signal when we are just connected,
+        so that we restore the disconnecting -> stop behaviour.
+        """
+        self.eip_conductor.reconnect_stop_signal()
+
     @QtCore.Slot()
     def _on_eip_network_unreachable(self):
         """
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index 64821ad6..01d6b371 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -28,7 +28,7 @@
      <property name="verticalSpacing">
       <number>0</number>
      </property>
-     <item row="0" column="2">
+     <item row="0" column="3">
       <widget class="QPushButton" name="btnEipStartStop">
        <property name="text">
         <string>Turn On</string>
@@ -86,7 +86,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="3">
+     <item row="0" column="4">
       <widget class="QLabel" name="lblVPNStatusIcon">
        <property name="maximumSize">
         <size>
@@ -118,7 +118,7 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="1" colspan="3">
+     <item row="2" column="1" colspan="4">
       <widget class="QWidget" name="eip_bandwidth" native="true">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="spacing">
@@ -161,12 +161,13 @@
             <property name="text">
              <string>0.0 KB/s</string>
             </property>
+            <property name="icon">
+             <iconset resource="../../../../../data/resources/mainwindow.qrc">
+              <normaloff>:/images/black/32/arrow-down.png</normaloff>:/images/black/32/arrow-down.png</iconset>
+            </property>
             <property name="flat">
              <bool>true</bool>
             </property>
-            <property name="icon">
-             <pixmap resource="../../../../../data/resources/icons.qrc">:/images/light/16/down-arrow.png</pixmap>
-            </property>
            </widget>
           </item>
           <item>
@@ -211,12 +212,13 @@
             <property name="text">
              <string>0.0 KB/s</string>
             </property>
+            <property name="icon">
+             <iconset resource="../../../../../data/resources/mainwindow.qrc">
+              <normaloff>:/images/black/32/arrow-up.png</normaloff>:/images/black/32/arrow-up.png</iconset>
+            </property>
             <property name="flat">
              <bool>true</bool>
             </property>
-            <property name="icon">
-             <pixmap resource="../../../../../data/resources/icons.qrc">:/images/light/16/up-arrow.png</pixmap>
-            </property>
            </widget>
           </item>
           <item>
@@ -237,6 +239,13 @@
        </layout>
       </widget>
      </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="btnFwDown">
+       <property name="text">
+        <string>Allow unencrypted traffic</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>