diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-08-04 11:29:15 +0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-08-04 17:25:23 -0300 |
| commit | 957350b4a45953e2d39e34cfd78d6ee0b711e573 (patch) | |
| tree | 25c2d0ea3dfbf9c65055be678f2792a5f33d0d9a /client/src/leap/soledad/client/api.py | |
| parent | 0a35ab802daf3a9c0f5297b823f0adcc0dce2999 (diff) | |
[refactor] remove circular dependency in SoledadCrypto
SoledadCrypto had Soledad as parameter to be able to use
SoledadSecrets. SoledadSecrets had SoledadCrypto as parameter to use
*crypt_sym. This commit removes this circular dependency passing
directly the secret that SoledadCrypto cares about to the constructor
and removing the *crypt_sym methods from SoledadCrypto.
- Resolves: #7338
Diffstat (limited to 'client/src/leap/soledad/client/api.py')
| -rw-r--r-- | client/src/leap/soledad/client/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py index 3e9f6bd4..57df4021 100644 --- a/client/src/leap/soledad/client/api.py +++ b/client/src/leap/soledad/client/api.py @@ -183,9 +183,7 @@ class Soledad(object): global SOLEDAD_CERT SOLEDAD_CERT = cert_file - # init crypto variables self._set_token(auth_token) - self._crypto = SoledadCrypto(self) self._init_config_with_defaults() self._init_working_dirs() @@ -200,6 +198,8 @@ class Soledad(object): self._init_secrets() self._init_u1db_sqlcipher_backend() + self._crypto = SoledadCrypto(self._secrets.remote_storage_secret) + if syncable: self._init_u1db_syncer() @@ -240,7 +240,7 @@ class Soledad(object): """ self._secrets = SoledadSecrets( self.uuid, self._passphrase, self._secrets_path, - self.shared_db, self._crypto) + self.shared_db) self._secrets.bootstrap() def _init_u1db_sqlcipher_backend(self): |