Merge remote-tracking branch 'refs/remotes/kali/feature/offline-mode' into develop

2 files changed, 35 insertions, 3 deletions

diff --git a/src/leap/bitmask/config/flags.py b/src/leap/bitmask/config/flags.py
index b1576c32..82501fb2 100644
--- a/src/leap/bitmask/config/flags.py
+++ b/src/leap/bitmask/config/flags.py
@@ -41,3 +41,7 @@ MAIL_LOGFILE = None
 #     since it's not released yet, and it is compatible with a newer provider.
 APP_VERSION_CHECK = True
 API_VERSION_CHECK = True
+
+# Offline mode?
+# Used for skipping soledad bootstrapping/syncs.
+OFFLINE = False
diff --git a/src/leap/bitmask/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py
index c524425e..91ff83a8 100644
--- a/src/leap/bitmask/config/leapsettings.py
+++ b/src/leap/bitmask/config/leapsettings.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # leapsettings.py
-# Copyright (C) 2013 LEAP
+# Copyright (C) 2013, 2014 LEAP
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,9 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 """
-QSettings abstraction
+QSettings abstraction.
 """
 import os
 import logging
@@ -70,6 +69,7 @@ class LeapSettings(object):
     GATEWAY_KEY = "Gateway"
     PINNED_KEY = "Pinned"
     SKIPFIRSTRUN_KEY = "SkipFirstRun"
+    UUIDFORUSER_KEY = "%s/%s_uuid"
 
     # values
     GATEWAY_AUTOMATIC = "Automatic"
@@ -353,3 +353,31 @@ class LeapSettings(object):
         """
         leap_assert_type(skip, bool)
         self._settings.setValue(self.SKIPFIRSTRUN_KEY, skip)
+
+    def get_uuid(self, username):
+        """
+        Gets the uuid for a given username.
+
+        :param username: the full user identifier in the form user@provider
+        :type username: basestring
+        """
+        leap_assert("@" in username,
+                    "Expected username in the form user@provider")
+        user, provider = username.split('@')
+        return self._settings.value(
+            self.UUIDFORUSER_KEY % (provider, user), "")
+
+    def set_uuid(self, username, value):
+        """
+        Sets the uuid for a given username.
+
+        :param username: the full user identifier in the form user@provider
+        :type username: basestring
+        :param value: the uuid to save
+        :type value: basestring
+        """
+        leap_assert("@" in username,
+                    "Expected username in the form user@provider")
+        user, provider = username.split('@')
+        leap_assert(len(value) > 0, "We cannot save an empty uuid")
+        self._settings.setValue(self.UUIDFORUSER_KEY % (provider, user), value)