From ae20f0a057f4740e3eedb1641d99c37601ad0b7f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 26 Apr 2018 16:43:00 +0200
Subject: No more direct GpgMe usage in the interfaces.

---
 framework/src/domain/mime/mailcrypto.h | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'framework/src/domain/mime/mailcrypto.h')

diff --git a/framework/src/domain/mime/mailcrypto.h b/framework/src/domain/mime/mailcrypto.h
index 9e317b43..c9247859 100644
--- a/framework/src/domain/mime/mailcrypto.h
+++ b/framework/src/domain/mime/mailcrypto.h
@@ -25,19 +25,28 @@
 #include <gpgme++/key.h>
 
 #include <QByteArray>
+#include <QVariant>
 
 #include <functional>
 #include <memory>
 
 namespace MailCrypto {
 
-Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
-processCrypto(std::unique_ptr<KMime::Content> content, const std::vector<GpgME::Key> &signingKeys,
-    const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey);
+struct Key {
+    GpgME::Key key;
+};
+
+struct Error {
+    GpgME::Error key;
+};
 
-std::vector<GpgME::Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false);
+Expected<Error, std::unique_ptr<KMime::Content>>
+processCrypto(std::unique_ptr<KMime::Content> content, const std::vector<Key> &signingKeys,
+    const std::vector<Key> &encryptionKeys, const Key &attachedKey);
 
-void importKeys(const std::vector<GpgME::Key> &keys);
+std::vector<Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false);
+
+void importKeys(const std::vector<Key> &keys);
 
 struct ImportResult {
     int considered;
@@ -48,3 +57,7 @@ struct ImportResult {
 ImportResult importKey(const QByteArray &key);
 
 }; // namespace MailCrypto
+
+Q_DECLARE_METATYPE(MailCrypto::Key);
+
+QDebug operator<< (QDebug d, const MailCrypto::Key &);
-- 
cgit v1.2.3