Merge branch 'feature/generic-wizard' into develop

The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:

- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 93dce3ac..54acbc0e 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -25,6 +25,7 @@ class EIPConductorAppMixin(object):
     def __init__(self, *args, **kwargs):
         opts = kwargs.pop('opts')
         config_file = getattr(opts, 'config_file', None)
+        provider = kwargs.pop('provider')
 
         self.eip_service_started = False
 
@@ -36,10 +37,11 @@ class EIPConductorAppMixin(object):
         self.conductor = EIPConnection(
             watcher_cb=self.newLogLine.emit,
             config_file=config_file,
-            checker_signals=(self.changeLeapStatus.emit, ),
-            status_signals=(self.statusChange.emit, ),
+            checker_signals=(self.eipStatusChange.emit, ),
+            status_signals=(self.openvpnStatusChange.emit, ),
             debug=self.debugmode,
-            ovpn_verbosity=opts.openvpn_verb)
+            ovpn_verbosity=opts.openvpn_verb,
+            provider=provider)
 
         self.skip_download = opts.no_provider_checks
         self.skip_verify = opts.no_ca_verify
@@ -137,14 +139,14 @@ class EIPConductorAppMixin(object):
             # is not ready yet.
             return
 
-        if self.conductor.with_errors:
+        #if self.conductor.with_errors:
             #XXX how to wait on pkexec???
             #something better that this workaround, plz!!
             #I removed the pkexec pass authentication at all.
             #time.sleep(5)
             #logger.debug('timeout')
-            logger.error('errors. disconnect')
-            self.start_or_stopVPN()  # is stop
+            #logger.error('errors. disconnect')
+            #self.start_or_stopVPN()  # is stop
 
         state = self.conductor.poll_connection_state()
         if not state: