diff options
author | Ruben Pollan <meskio@sindominio.net> | 2016-03-20 19:52:46 +0100 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2016-03-24 17:04:41 +0100 |
commit | c1aab81de2dcc69e3dd39f9f11501d1236a4a9db (patch) | |
tree | 98aeed5d82e04bc234e9d9333c5e8aa3fc6676f3 | |
parent | 527179a6d6a5dd1672dbf5513deffd99d15c9c91 (diff) |
[bug] Decode attached keys so they are recognized by keymanager
- Resolves: #7977
-rw-r--r-- | mail/changes/next-changelog.rst | 1 | ||||
-rw-r--r-- | mail/src/leap/mail/incoming/service.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mail/changes/next-changelog.rst b/mail/changes/next-changelog.rst index 40efb19..f89af89 100644 --- a/mail/changes/next-changelog.rst +++ b/mail/changes/next-changelog.rst @@ -22,6 +22,7 @@ Bugfixes ~~~~~~~~ - `#7861 <https://leap.se/code/issues/7861>`_: Use the right succeed function for passthrough encrypted email. - `#7898 <https://leap.se/code/issues/7898>`_: Fix IMAP fetch headers +- `#7977 <https://leap.se/code/issues/7977>`_: Decode attached keys so they are recognized by keymanager. - Fix the get_body logic for corner-cases in which body is None (yet-to-be synced docs, mainly). - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235. diff --git a/mail/src/leap/mail/incoming/service.py b/mail/src/leap/mail/incoming/service.py index 98ed416..c7d194d 100644 --- a/mail/src/leap/mail/incoming/service.py +++ b/mail/src/leap/mail/incoming/service.py @@ -749,7 +749,7 @@ class IncomingMail(Service): for attachment in attachments: if MIME_KEY == attachment.get_content_type(): d = self._keymanager.put_raw_key( - attachment.get_payload(), + attachment.get_payload(decode=True), OpenPGPKey, address=address) d.addCallbacks(log_key_added, failed_put_key) |