No more direct GpgMe usage in the interfaces.

1 files changed, 16 insertions, 16 deletions

diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index a71e66f9..fc436003 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -36,7 +36,7 @@
 #include "mime/mailcrypto.h"
 #include "async.h"
 
-std::vector<GpgME::Key> &operator+=(std::vector<GpgME::Key> &list, const std::vector<GpgME::Key> &add)
+std::vector<MailCrypto::Key> &operator+=(std::vector<MailCrypto::Key> &list, const std::vector<MailCrypto::Key> &add)
 {
     list.insert(std::end(list), std::begin(add), std::end(add));
     return list;
@@ -133,16 +133,16 @@ public:
         mb.fromUnicodeString(addressee);
 
         SinkLog() << "Searching key for: " << mb.address();
-        asyncRun<std::vector<GpgME::Key>>(this,
+        asyncRun<std::vector<MailCrypto::Key>>(this,
             [mb] {
                 return MailCrypto::findKeys(QStringList{} << mb.address(), false, false);
             },
-            [this, addressee, id](const std::vector<GpgME::Key> &keys) {
+            [this, addressee, id](const std::vector<MailCrypto::Key> &keys) {
                 if (!keys.empty()) {
                     if (keys.size() > 1) {
                         SinkWarning() << "Found more than one key, encrypting to all of them.";
                     }
-                    SinkLog() << "Found key: " << keys.front().primaryFingerprint();
+                    SinkLog() << "Found key: " << keys.front();
                     setValue(id, "keyFound", true);
                     setValue(id, "key", QVariant::fromValue(keys));
                     mMissingKeys.remove(id);
@@ -227,10 +227,10 @@ void ComposerController::findPersonalKey()
 {
     auto identity = getIdentity();
     SinkLog() << "Looking for personal key for: " << identity.address();
-    asyncRun<std::vector<GpgME::Key>>(this, [=] {
+    asyncRun<std::vector<MailCrypto::Key>>(this, [=] {
             return MailCrypto::findKeys(QStringList{} << identity.address(), true);
         },
-        [this](const std::vector<GpgME::Key> &keys) {
+        [this](const std::vector<MailCrypto::Key> &keys) {
             if (keys.empty()) {
                 SinkWarning() << "Failed to find a personal key.";
             } else if (keys.size() > 1) {
@@ -419,23 +419,23 @@ void ComposerController::recordForAutocompletion(const QByteArray &addrSpec, con
     }
 }
 
-std::vector<GpgME::Key> ComposerController::getRecipientKeys()
+std::vector<MailCrypto::Key> ComposerController::getRecipientKeys()
 {
-    std::vector<GpgME::Key> keys;
+    std::vector<MailCrypto::Key> keys;
     {
-        const auto list = toController()->getList<std::vector<GpgME::Key>>("key");
+        const auto list = toController()->getList<std::vector<MailCrypto::Key>>("key");
         for (const auto &l: list) {
             keys.insert(std::end(keys), std::begin(l), std::end(l));
         }
     }
     {
-        const auto list = ccController()->getList<std::vector<GpgME::Key>>("key");
+        const auto list = ccController()->getList<std::vector<MailCrypto::Key>>("key");
         for (const auto &l: list) {
             keys.insert(std::end(keys), std::begin(l), std::end(l));
         }
     }
     {
-        const auto list = bccController()->getList<std::vector<GpgME::Key>>("key");
+        const auto list = bccController()->getList<std::vector<MailCrypto::Key>>("key");
         for (const auto &l: list) {
             keys.insert(std::end(keys), std::begin(l), std::end(l));
         }
@@ -463,17 +463,17 @@ KMime::Message::Ptr ComposerController::assembleMessage()
         };
     });
 
-    GpgME::Key attachedKey;
-    std::vector<GpgME::Key> signingKeys;
+    MailCrypto::Key attachedKey;
+    std::vector<MailCrypto::Key> signingKeys;
     if (getSign()) {
-        signingKeys = getPersonalKeys().value<std::vector<GpgME::Key>>();
+        signingKeys = getPersonalKeys().value<std::vector<MailCrypto::Key>>();
         Q_ASSERT(!signingKeys.empty());
         attachedKey = signingKeys[0];
     }
-    std::vector<GpgME::Key> encryptionKeys;
+    std::vector<MailCrypto::Key> encryptionKeys;
     if (getEncrypt()) {
         //Encrypt to self so we can read the sent message
-        auto personalKeys = getPersonalKeys().value<std::vector<GpgME::Key>>();
+        auto personalKeys = getPersonalKeys().value<std::vector<MailCrypto::Key>>();
 
         attachedKey = personalKeys[0];