From 9c59611167ccf040cd7e65a257cea91d37013567 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 14 Jan 2015 19:31:24 -0200 Subject: Not deferring encryption/decryption for soledad - this how it was on soledad 0.6.0, mail sync should work again --- service/pixelated/bitmask_libraries/soledad.py | 2 +- service/test/unit/bitmask_libraries/soledad_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'service') diff --git a/service/pixelated/bitmask_libraries/soledad.py b/service/pixelated/bitmask_libraries/soledad.py index cf71a727..e6607bde 100644 --- a/service/pixelated/bitmask_libraries/soledad.py +++ b/service/pixelated/bitmask_libraries/soledad.py @@ -67,7 +67,7 @@ class SoledadSession(object): local_db = self._local_db_path() return Soledad(self.leap_srp_session.uuid, unicode(encryption_passphrase), secrets, - local_db, server_url, which_bundle(self.provider), self.leap_srp_session.token) + local_db, server_url, which_bundle(self.provider), self.leap_srp_session.token, defer_encryption=False) except (WrongMac, UnknownMacMethod, MacMethods), e: raise SoledadWrongPassphraseException(e) diff --git a/service/test/unit/bitmask_libraries/soledad_test.py b/service/test/unit/bitmask_libraries/soledad_test.py index 83a19fe1..c8b45710 100644 --- a/service/test/unit/bitmask_libraries/soledad_test.py +++ b/service/test/unit/bitmask_libraries/soledad_test.py @@ -40,7 +40,7 @@ class SoledadSessionTest(AbstractLeapTest): init_mock.assert_called_with(self.uuid, 'any-passphrase', '%s/soledad/%s.secret' % (self.leap_home, self.uuid), '%s/soledad/%s.db' % (self.leap_home, self.uuid), 'https://couch1.some-server.test:1234/user-%s' % self.uuid, - '/some/path/to/ca_cert', self.token) + '/some/path/to/ca_cert', self.token, defer_encryption=False) def test_that_sync_is_called(self, soledad_mock): instance = soledad_mock.return_value -- cgit v1.2.3