diff options
author | Ruben Pollan <meskio@sindominio.net> | 2017-10-24 11:50:30 +0200 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2017-10-26 18:37:04 +0200 |
commit | d16b25da0962156601615587a612b57b918b0dc6 (patch) | |
tree | a12a9b3bd7b9ed75c9515da8293ea115e132106a /src/leap/bitmask/core | |
parent | beb9f0449ec680d5adfab09e5969819aba99b7ef (diff) |
[bug] make nicknym return key data
There was a mismatch on the return values of Nicknym class and the
expectations. As most of the code was expecting an OpenPGPKey, but it
was returning the json as it came from the nickserver. Now is just
returning the key data.
Diffstat (limited to 'src/leap/bitmask/core')
-rw-r--r-- | src/leap/bitmask/core/mail_services.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 5337b313..31c27364 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -298,10 +298,9 @@ class KeymanagerContainer(Container): try: remote = yield keymanager._nicknym.fetch_key_with_address(userid) except Exception: - remote = {} + remote = "" - if (keymanager.OPENPGP_KEY not in remote or - key.key_data != remote[KeyManager.OPENPGP_KEY]): + if key.key_data != remote: yield keymanager.send_key() def _set_status(self, address, status, error=None, keys=None): |