Port to gpgme only.

QGpgme and Gpgmepp are not readily available, the cmake files buggy, the
buildsystem horrendous and generally just difficult to build on windows.
Given that all they are is a wrapper around gpgme, we're better of
without all the indirections.

What we loose is:
* QGpgme moved the work to separate threads (but we then blocked
anyways), something that we can just do in our own code should we want to.
* QGpgme has a function to prettify dn's that was used to show the
signer. Also something we could bring back should we need to (don't know
where it is useful atm.)

Ported messagepart to gpgme

Almost there

Moved the crypto bits to a separate file

All gpg code is in one place.

All tests passing

Use error codes

Cleanup

1 files changed, 4 insertions, 27 deletions

diff --git a/framework/src/domain/mime/mailcrypto.h b/framework/src/domain/mime/mailcrypto.h
index c9247859..6f19063d 100644
--- a/framework/src/domain/mime/mailcrypto.h
+++ b/framework/src/domain/mime/mailcrypto.h
@@ -22,42 +22,19 @@
 #include "framework/src/errors.h"
 
 #include <KMime/Message>
-#include <gpgme++/key.h>
 
 #include <QByteArray>
 #include <QVariant>
 
 #include <functional>
 #include <memory>
+#include "crypto.h"
 
 namespace MailCrypto {
 
-struct Key {
-    GpgME::Key key;
-};
-
-struct Error {
-    GpgME::Error key;
-};
-
-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);
-
-std::vector<Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false);
-
-void importKeys(const std::vector<Key> &keys);
-
-struct ImportResult {
-    int considered;
-    int imported;
-    int unchanged;
-};
-
-ImportResult importKey(const QByteArray &key);
+Expected<Crypto::Error, std::unique_ptr<KMime::Content>>
+processCrypto(std::unique_ptr<KMime::Content> content, const std::vector<Crypto::Key> &signingKeys,
+    const std::vector<Crypto::Key> &encryptionKeys, const Crypto::Key &attachedKey);
 
 }; // namespace MailCrypto
 
-Q_DECLARE_METATYPE(MailCrypto::Key);
-
-QDebug operator<< (QDebug d, const MailCrypto::Key &);