summaryrefslogtreecommitdiff
path: root/client/src/leap/soledad/client/sqlcipher.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-12-15 15:55:25 -0200
committerdrebs <drebs@leap.se>2014-12-15 15:55:25 -0200
commita7abb6eb3fe9a0a904bcabd0bf344637e9fd4e62 (patch)
treebeb655c22404192f3d4cbd40141a23f69701945d /client/src/leap/soledad/client/sqlcipher.py
parentdafcfac4663d00ee2049b0a245c2ecb84ef2bad5 (diff)
Fix deferred enc/dec params and fallback (#6500).
Diffstat (limited to 'client/src/leap/soledad/client/sqlcipher.py')
-rw-r--r--client/src/leap/soledad/client/sqlcipher.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index 2df9606e..fded2119 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -452,6 +452,11 @@ class SQLCipherDatabase(sqlite_backend.SQLitePartialExpandDatabase):
# XXX could mark the critical section here...
try:
+ if defer_decryption and not self.defer_encryption:
+ logger.warning("Can't defer decryption without first having "
+ "created a sync db. Falling back to normal "
+ "syncing mode.")
+ defer_decryption = False
res = syncer.sync(autocreate=autocreate,
defer_decryption=defer_decryption)