diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2014-09-16 11:00:45 -0500 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2014-09-16 13:03:44 -0500 |
| commit | 50113102b7b089a576a14d459271ac3c2db48968 (patch) | |
| tree | 7f26c594c15280c1ca370093df098ed95bbb628e /src/leap/bitmask/backend | |
| parent | c3b2345dcc715f02fdfe4ffc04446236e17105a8 (diff) | |
New keymanager API
get_all_keys_in_local_db -> get_all_keys
parse_openpgp_ascii_key -> None
Diffstat (limited to 'src/leap/bitmask/backend')
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index d4f6d176..50f723cb 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -914,6 +914,8 @@ class Keymanager(object): keymanager = self._keymanager_proxy try: + # NOTE: parse_openpgp_ascii_key is not in keymanager anymore + # the API for that will need some thinking public_key, private_key = keymanager.parse_openpgp_ascii_key( new_key) except (KeyAddressMismatch, KeyFingerprintMismatch) as e: @@ -974,7 +976,7 @@ class Keymanager(object): """ List all the keys stored in the local DB. """ - keys = self._keymanager_proxy.get_all_keys_in_local_db() + keys = self._keymanager_proxy.get_all_keys() self._signaler.signal(self._signaler.keymanager_keys_list, keys) def get_key_details(self, username): |