summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/src/leap/soledad/client/api.py10
-rw-r--r--client/src/leap/soledad/client/encdecpool.py1
2 files changed, 6 insertions, 5 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index fd91ff8b..6c2b3673 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -662,9 +662,9 @@ class Soledad(object):
self._last_received_docs = docs = self._dbsyncer.received_docs
# Post-Sync Hooks
- synced_plugin = soledad_interfaces.ISoledadPostSyncPlugin
if docs:
- suitable_plugins = collect_plugins(synced_plugin)
+ iface = soledad_interfaces.ISoledadPostSyncPlugin
+ suitable_plugins = collect_plugins(iface)
for plugin in suitable_plugins:
watched = plugin.watched_doc_types
r = [filter(
@@ -805,13 +805,15 @@ class Soledad(object):
def raw_sqlcipher_query(self, *args, **kw):
"""
- Run a raw sqlcipher query in the local database, and return the result.
+ Run a raw sqlcipher query in the local database, and return a deferred
+ that will be fired with the result.
"""
return self._dbpool.runQuery(*args, **kw)
def raw_sqlcipher_operation(self, *args, **kw):
"""
- Run a raw sqlcipher operation in the local database, and return None.
+ Run a raw sqlcipher operation in the local database, and return a
+ deferred that will be fired with None.
"""
return self._dbpool.runOperation(*args, **kw)
diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py
index eff53e28..f81cd2d1 100644
--- a/client/src/leap/soledad/client/encdecpool.py
+++ b/client/src/leap/soledad/client/encdecpool.py
@@ -579,7 +579,6 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
query += " ORDER BY %s %s" % (order_by, order)
return self._runQuery(query)
-
@defer.inlineCallbacks
def _get_insertable_docs(self):
"""