From 1e6e165a3fc397e45884eaec1122ba0cc5ff923e Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 5 Jan 2017 14:46:39 -0200
Subject: Revert "[#888] Fix soledad class contract to be compatible with new
 merge. with @thaissiqueira."

This reverts commit ebdeec4ad6d0f91bc60fd34a580fc02787026692.
---
 service/pixelated/config/sessions.py                | 3 ++-
 service/test/support/integration/app_test_client.py | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index b3021982..ec5e1c0e 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -82,7 +82,8 @@ class LeapSessionFactory(object):
                                                   server_url=server_url,
                                                   cert_file=api_cert,
                                                   shared_db=None,
-                                                  auth_token=user_token)
+                                                  auth_token=user_token,
+                                                  defer_encryption=False)
             defer.returnValue(soledad)
         except (WrongMacError, UnknownMacMethodError), e:
             raise SoledadWrongPassphraseException(e)
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index 0ff1df31..d52c85c0 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -437,7 +437,9 @@ def initialize_soledad(tempdir, uuid):
         secret_path,
         local_db_path,
         server_url,
-        cert_file)
+        cert_file,
+        defer_encryption=False,
+        syncable=False)
 
     yield SoledadMailAdaptor().initialize_store(_soledad)
 
-- 
cgit v1.2.3