summaryrefslogtreecommitdiff
path: root/src/leap/soledad
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2012-12-03 14:13:56 -0200
committerdrebs <drebs@leap.se>2012-12-03 14:13:56 -0200
commitcff9a6ed359f3cfc8ec3e7ad94f159acfc5a4fd8 (patch)
treea80f610c5fafe37d7dae726d178827ac277fb07c /src/leap/soledad
parent2980e61298dc3a17715ce5693470c3d7f3a86497 (diff)
Add default key to Leap Document
Diffstat (limited to 'src/leap/soledad')
-rw-r--r--src/leap/soledad/leap.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/soledad/leap.py b/src/leap/soledad/leap.py
index 863e63f8..46f95a1a 100644
--- a/src/leap/soledad/leap.py
+++ b/src/leap/soledad/leap.py
@@ -5,6 +5,7 @@ except ImportError:
from u1db import Document
from u1db.remote.http_target import HTTPSyncTarget
+from u1db.remote.http_database import HTTPDatabase
import base64
@@ -16,10 +17,11 @@ class LeapDocument(Document):
"""
def __init__(self, doc_id=None, rev=None, json='{}', has_conflicts=False,
- encrypted_json=None):
+ encrypted_json=None, default_key=None):
super(Document, self).__init__(doc_id, rev, json, has_conflicts)
if encrypted_json:
self.set_encrypted_json(encrypted_json)
+ self._default_key = default_key
def get_encrypted_json(self):
"""