Merge branch 'feature/eip-service-formatchange' into develop

2 files changed, 8 insertions, 2 deletions

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 54acbc0e..0d7506b3 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -203,6 +203,8 @@ class EIPConductorAppMixin(object):
                 # we could bring Timer Init to this Mixin
                 # or to its own Mixin.
                 self.timer.start(constants.TIMER_MILLISECONDS)
+                # XXX EMIT SIGNAL INSTEAD (when first run,
+                # network checker does not exist...)
                 self.network_checker.start()
             return
 
diff --git a/src/leap/baseapp/network.py b/src/leap/baseapp/network.py
index 3e57490d..7363cfaa 100644
--- a/src/leap/baseapp/network.py
+++ b/src/leap/baseapp/network.py
@@ -18,13 +18,17 @@ class NetworkCheckerAppMixin(object):
 
     def __init__(self, *args, **kwargs):
         provider = kwargs.pop('provider', None)
+        if provider:
+            self.init_network_checker(provider)
+
+    def init_network_checker(self, provider):
         self.network_checker = NetworkCheckerThread(
             error_cb=self.networkError.emit,
             debug=self.debugmode,
             provider=provider)
 
-        # XXX move run_checks to slot -- this definitely
-        # cannot start on init!!!
+    @QtCore.pyqtSlot(object)
+    def runNetworkChecks(self):
         self.network_checker.run_checks()
 
     @QtCore.pyqtSlot(object)