summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-09-21 16:06:28 -0400
committerdrebs <drebs@leap.se>2016-12-12 09:11:59 -0200
commit6d1e6a9a8a0a70c43f9cd23c4541cd08618d3d11 (patch)
tree4e26bac32f4137755844cd555f45e22d67a2b399
parent0098849ffd6d9d7514a2eff7b6ced9403a9062ca (diff)
[bug] fix wrong content parsing
-rw-r--r--client/src/leap/soledad/client/http_target/fetch.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/client/src/leap/soledad/client/http_target/fetch.py b/client/src/leap/soledad/client/http_target/fetch.py
index 2e54ca70..a0c35063 100644
--- a/client/src/leap/soledad/client/http_target/fetch.py
+++ b/client/src/leap/soledad/client/http_target/fetch.py
@@ -49,9 +49,6 @@ class HTTPDocFetcher(object):
@defer.inlineCallbacks
def _receive_docs(self, last_known_generation, last_known_trans_id,
ensure_callback, sync_id):
-
- print 'receiving.....', sync_id
-
new_generation = last_known_generation
new_transaction_id = last_known_trans_id
@@ -104,16 +101,13 @@ class HTTPDocFetcher(object):
:param total: The total number of operations.
:type total: int
"""
- # decrypt incoming document and insert into local database
# If arriving content was symmetrically encrypted, we decrypt
+ # decrypt incoming document and insert into local database
doc = SoledadDocument(doc_info['id'], doc_info['rev'], content)
- print "GOT.....", doc
-
- payload = doc['raw']
+ payload = doc.content['raw']
if is_symmetrically_encrypted(payload):
- print "SHOULD DECRYPT!!!!", content
decrypted = yield self._crypto.decrypt_doc(doc)
doc.set_json(decrypted)