summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-04-24 16:49:09 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-04-24 16:49:09 -0300
commit639c78246da3de6bc0d176bc64dc95ecddbbc03f (patch)
treeeb42427635b0640521429f59d0eed4d825656b5f
parent8b3bd20e60daa76e37548663ec1655df7ccebadd (diff)
Show which provider we are using to rounte traffic.
Closes #5551.
-rw-r--r--changes/bug-5551_wrong-eip-status-msg1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py14
2 files changed, 7 insertions, 8 deletions
diff --git a/changes/bug-5551_wrong-eip-status-msg b/changes/bug-5551_wrong-eip-status-msg
new file mode 100644
index 00000000..9b1940a1
--- /dev/null
+++ b/changes/bug-5551_wrong-eip-status-msg
@@ -0,0 +1 @@
+- Client mistakenly says that traffic is routed in the clear. Closes #5551.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 3a94a58d..b49717c9 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1517,9 +1517,14 @@ class MainWindow(QtGui.QMainWindow):
"""
self._eip_connection.qtsigs.connected_signal.emit()
- # check for connectivity
provider_config = self._get_best_provider_config()
domain = provider_config.get_domain()
+
+ self._eip_status.set_provider(domain)
+ self._settings.set_defaultprovider(provider)
+ self._already_started_eip = True
+
+ # check for connectivity
self._check_name_resolution(domain)
def _check_name_resolution(self, domain):
@@ -1676,13 +1681,6 @@ class MainWindow(QtGui.QMainWindow):
"system.").format(self._eip_name))
self._set_eipstatus_off()
- def _on_eip_connected(self):
- # XXX move to the state machine too
- self._eip_status.set_provider(provider)
-
- self._settings.set_defaultprovider(provider)
- self._already_started_eip = True
-
@QtCore.Slot()
def _stop_eip(self):
"""