summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-03-12 20:08:57 +0100
committerdrebs <drebs@riseup.net>2017-03-12 20:08:57 +0100
commit7f0ff6a52119a423c1539c2122318b767eddf220 (patch)
tree017a0ab9715958b6da1156f1dd2d25e90ef20ff2
parent7b1f3d7fe7d54d3a2bec8a7e4a5ad5d08319116d (diff)
[bug] remove offline toggle
The offline toggle added a race condition in which the client could end up offline forever. We decided to remove it for now and then decide if soledad client needs to know about network connectivity (check: https://0xacab.org/leap/soledad/issues/8789).
-rw-r--r--src/leap/bitmask/core/mail_services.py8
-rw-r--r--src/leap/bitmask/keymanager/testing/__init__.py1
-rw-r--r--src/leap/bitmask/mail/imap/service/imap-server.tac3
-rw-r--r--src/leap/bitmask/mail/testing/__init__.py3
-rw-r--r--src/leap/bitmask/mail/testing/common.py1
5 files changed, 3 insertions, 13 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 7d5d953..c087607 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -120,16 +120,11 @@ class SoledadContainer(Container):
local_db_path=local_db_path,
server_url=server_url,
cert_file=cert_file,
- auth_token=token,
- offline=True)
+ auth_token=token)
def set_remote_auth_token(self, userid, token):
self.get_instance(userid).token = token
- def set_offline(self, userid, state):
- # TODO should check that there's a token!
- self.get_instance(userid).offline = bool(state)
-
def sync(self, userid):
self.get_instance(userid).sync()
@@ -201,7 +196,6 @@ class SoledadService(HookableService):
if container.get_instance(userid):
logger.debug("passing a new SRP Token to Soledad: %s" % userid)
container.set_remote_auth_token(userid, token)
- container.set_offline(userid, False)
else:
logger.debug("adding a new Soledad Instance: %s" % userid)
container.add_instance(
diff --git a/src/leap/bitmask/keymanager/testing/__init__.py b/src/leap/bitmask/keymanager/testing/__init__.py
index 3cc0c10..63ccf50 100644
--- a/src/leap/bitmask/keymanager/testing/__init__.py
+++ b/src/leap/bitmask/keymanager/testing/__init__.py
@@ -264,7 +264,6 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest):
server_url='',
cert_file=None,
auth_token=None,
- offline=True,
shared_db=FakeSharedDb(),
)
diff --git a/src/leap/bitmask/mail/imap/service/imap-server.tac b/src/leap/bitmask/mail/imap/service/imap-server.tac
index a5c390f..295bdc0 100644
--- a/src/leap/bitmask/mail/imap/service/imap-server.tac
+++ b/src/leap/bitmask/mail/imap/service/imap-server.tac
@@ -65,8 +65,7 @@ def initialize_soledad(uuid, email, passwd,
secrets,
localdb,
server_url,
- cert_file,
- offline=True)
+ cert_file)
return soledad
diff --git a/src/leap/bitmask/mail/testing/__init__.py b/src/leap/bitmask/mail/testing/__init__.py
index 54aaa87..2fc4c07 100644
--- a/src/leap/bitmask/mail/testing/__init__.py
+++ b/src/leap/bitmask/mail/testing/__init__.py
@@ -54,8 +54,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest):
server_url='',
cert_file=None,
auth_token=None,
- shared_db=defaultMockSharedDB(),
- offline=True)
+ shared_db=defaultMockSharedDB())
self.km = self._key_manager()
diff --git a/src/leap/bitmask/mail/testing/common.py b/src/leap/bitmask/mail/testing/common.py
index d969dee..3bd7bc9 100644
--- a/src/leap/bitmask/mail/testing/common.py
+++ b/src/leap/bitmask/mail/testing/common.py
@@ -70,7 +70,6 @@ def _initialize_soledad(email, gnupg_home, tempdir):
local_db_path,
server_url,
cert_file,
- offline=True,
shared_db=FakeSharedDb())
return soledad