diff options
author | drebs <drebs@leap.se> | 2015-07-23 18:08:13 -0300 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-07-27 10:03:30 -0400 |
commit | b5a3e7191c423314afce20627e83339226c94729 (patch) | |
tree | d1675264ae6f2aa3f10a3956173c9bc6add490fc /client/src/leap/soledad/client/sqlcipher.py | |
parent | f8a79cf8df519f3271daf9dc5b8e73c359b886a1 (diff) |
[bug] avoid double decryption of documents
Because of how the incoming document queue is implemented, it could be the
case that a document was sent to async decryption queue more than once. This
commit creates a list of documents to be decrypted, so we avoid sending the
same document to the queue more than once.
Diffstat (limited to 'client/src/leap/soledad/client/sqlcipher.py')
-rw-r--r-- | client/src/leap/soledad/client/sqlcipher.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py index de752267..34fd90b4 100644 --- a/client/src/leap/soledad/client/sqlcipher.py +++ b/client/src/leap/soledad/client/sqlcipher.py @@ -62,12 +62,10 @@ from twisted.internet.threads import deferToThreadPool from twisted.python.threadpool import ThreadPool from twisted.enterprise import adbapi -from leap.soledad.client import encdecpool from leap.soledad.client.http_target import SoledadHTTPSyncTarget from leap.soledad.client.sync import SoledadSynchronizer from leap.soledad.client import pragmas -from leap.soledad.common import soledad_assert from leap.soledad.common.document import SoledadDocument @@ -637,11 +635,6 @@ class SQLCipherU1DBSync(SQLCipherDatabase): for url in self._syncers.keys(): del self._syncers[url] - # stop the encryption pool - if self._sync_enc_pool is not None: - self._sync_enc_pool.close() - self._sync_enc_pool = None - class U1DBSQLiteBackend(sqlite_backend.SQLitePartialExpandDatabase): """ |