update to 0.3.0

1 files changed, 10 insertions, 6 deletions

diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index b4e0d18..a830fa1 100644
--- a/src/leap/mx/mail_receiver.py
+++ b/src/leap/mx/mail_receiver.py
@@ -116,21 +116,25 @@ class MailReceiver(Service):
 
         if pubkey is None or len(pubkey) == 0:
             doc.content = {
+                "incoming": True,
                 "_enc_scheme": EncryptionSchemes.NONE,
                 "_enc_json": json.dumps(data)
             }
             return uuid, doc
 
-        def _ascii_to_openpgp_cb(gpg):
+        openpgp_key = None
+        with openpgp.TempGPGWrapper(gpgbinary='/usr/bin/gpg') as gpg:
+            gpg.import_keys(pubkey)
             key = gpg.list_keys().pop()
-            return openpgp._build_key_from_gpg(address, key, pubkey)
-
-        openpgp_key = openpgp._safe_call(_ascii_to_openpgp_cb, pubkey)
+            openpgp_key = openpgp._build_key_from_gpg(address, key, pubkey)
 
         doc.content = {
+            "incoming": True,
             "_enc_scheme": EncryptionSchemes.PUBKEY,
-            "_enc_json": openpgp.encrypt_asym(json.dumps(data),
-                                              openpgp_key)
+            "_enc_json": str(gpg.encrypt(
+                json.dumps(data),
+                openpgp_key.fingerprint,
+                symmetric=False))
         }
 
         return uuid, doc