enable --offline mode for email again

3 files changed, 20 insertions, 15 deletions

diff --git a/src/leap/bitmask/backend/backend_proxy.py b/src/leap/bitmask/backend/backend_proxy.py
index 3e79289f..e9ad9b4d 100644
--- a/src/leap/bitmask/backend/backend_proxy.py
+++ b/src/leap/bitmask/backend/backend_proxy.py
@@ -28,6 +28,7 @@ import time
 import zmq
 
 from leap.bitmask.backend.api import API, STOP_REQUEST, PING_REQUEST
+from leap.bitmask.backend.settings import Settings
 from leap.bitmask.backend.utils import generate_zmq_certificates_if_needed
 from leap.bitmask.backend.utils import get_backend_certificates
 
@@ -54,6 +55,8 @@ class BackendProxy(object):
 
         self._socket = None
 
+        self.settings = Settings()
+
         # initialize ZMQ stuff:
         context = zmq.Context()
         logger.debug("Connecting to server...")
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 2ae796f6..a843147e 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -779,6 +779,8 @@ class Soledad(object):
         """
         provider_config = ProviderConfig.get_provider_config(domain)
         if provider_config is not None:
+            # XXX FIXME --- remove defer-to-thread or at least put it in a
+            # separate threadpool.
             self._soledad_defer = threads.deferToThread(
                 self._soledad_bootstrapper.run_soledad_setup_checks,
                 provider_config, username, password,
@@ -816,8 +818,9 @@ class Soledad(object):
             Signaler.soledad_offline_finished
             Signaler.soledad_offline_failed
         """
-        self._soledad_bootstrapper.load_offline_soledad(
+        d = self._soledad_bootstrapper.load_offline_soledad(
             username, password, uuid)
+        d.addCallback(self._set_proxies_cb)
 
     def cancel_bootstrap(self):
         """
diff --git a/src/leap/bitmask/backend/settings.py b/src/leap/bitmask/backend/settings.py
index 5cb4c616..ed70ca6b 100644
--- a/src/leap/bitmask/backend/settings.py
+++ b/src/leap/bitmask/backend/settings.py
@@ -122,37 +122,36 @@ class Settings(object):
         self._settings.set(provider, self.GATEWAY_KEY, gateway)
         self._save()
 
-    def get_uuid(self, username):
+    def get_uuid(self, full_user_id):
         """
         Gets the uuid for a given username.
 
-        :param username: the full user identifier in the form user@provider
-        :type username: basestring
+        :param full_user_id: the full user identifier in the form user@provider
+        :type full_user_id: basestring
         """
-        leap_assert("@" in username,
+        leap_assert("@" in full_user_id,
                     "Expected username in the form user@provider")
-        user, provider = username.split('@')
+        username, provider = full_user_id.split('@')
+        return self._get_value(provider, full_user_id, "")
 
-        return self._get_value(provider, username, "")
-
-    def set_uuid(self, username, value):
+    def set_uuid(self, full_user_id, value):
         """
         Sets the uuid for a given username.
 
-        :param username: the full user identifier in the form user@provider
-        :type username: str or unicode
+        :param full_user_id: the full user identifier in the form user@provider
+        :type full_user_id: str or unicode
         :param value: the uuid to save or None to remove it
         :type value: str or unicode or None
         """
-        leap_assert("@" in username,
+        leap_assert("@" in full_user_id,
                     "Expected username in the form user@provider")
-        user, provider = username.split('@')
+        user, provider = full_user_id.split('@')
 
         if value is None:
-            self._settings.remove_option(provider, username)
+            self._settings.remove_option(provider, full_user_id)
         else:
             leap_assert(len(value) > 0, "We cannot save an empty uuid")
             self._add_section(provider)
-            self._settings.set(provider, username, value)
+            self._settings.set(provider, full_user_id, value)
 
         self._save()