summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-10-06 12:57:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-10-06 12:57:46 -0300
commita57154017b47f14c51829bead81f7588f3db22ed (patch)
tree32f3b0e4be4e1cb2a153822327d5a1a0c3fdbf5a /src/leap
parent43217db58bf06f4b89f506f38bef64f536bc9bbb (diff)
parent50113102b7b089a576a14d459271ac3c2db48968 (diff)
Merge remote-tracking branch 'meskio/feature/keymanager_api' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/backend/components.py4
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):