From 1112e1530587d71b1bc21f9e19b4ed95fbe30fa2 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 7 Mar 2018 17:41:23 +0100
Subject: Remove protocol differentiation since we only use OpenPGP

---
 framework/src/domain/composercontroller.cpp |  5 ++---
 framework/src/domain/mime/mailcrypto.cpp    | 10 +++++-----
 framework/src/domain/mime/mailcrypto.h      | 24 ++++++++++++------------
 framework/src/domain/mime/mailtemplates.cpp |  2 +-
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 37902164..d91d09be 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -133,9 +133,8 @@ public:
         mb.fromUnicodeString(addressee);
 
         SinkLog() << "Searching key for: " << mb.address();
-        asyncRun<std::vector<GpgME::Key>>(this,
-            [mb] {
-                return MailCrypto::findKeys(QStringList{} << mb.address(), false, false, MailCrypto::OPENPGP);
+        asyncRun<std::vector<GpgME::Key>>(this, [mb] {
+                return MailCrypto::findKeys(QStringList{} << mb.address(), false, false);
             },
             [this, addressee, id](const std::vector<GpgME::Key> &keys) {
                 if (!keys.empty()) {
diff --git a/framework/src/domain/mime/mailcrypto.cpp b/framework/src/domain/mime/mailcrypto.cpp
index f25c75fe..83ce293a 100644
--- a/framework/src/domain/mime/mailcrypto.cpp
+++ b/framework/src/domain/mime/mailcrypto.cpp
@@ -400,7 +400,7 @@ Expected<GpgME::Error, KMime::Content *> createSignedEmail(KMime::Content *conte
 
 KMime::Content *MailCrypto::processCrypto(KMime::Content *content,
     const std::vector<GpgME::Key> &signingKeys, const std::vector<GpgME::Key> &encryptionKeys,
-    const GpgME::Key &attachedKey, MailCrypto::Protocol protocol)
+    const GpgME::Key &attachedKey)
 {
 
     qDebug() << "Attaching key:" << attachedKey.shortKeyID() << "from processCrypto";
@@ -425,7 +425,7 @@ void MailCrypto::importKeys(const std::vector<GpgME::Key> &keys)
     job->exec(keys);
 }
 
-static GpgME::KeyListResult listKeys(GpgME::Protocol protocol, const QStringList &patterns, bool secretOnly, int keyListMode, std::vector<GpgME::Key> &keys)
+static GpgME::KeyListResult listKeys(const QStringList &patterns, bool secretOnly, int keyListMode, std::vector<GpgME::Key> &keys)
 {
     QByteArrayList list;
     std::transform(patterns.constBegin(), patterns.constEnd(), std::back_inserter(list), [] (const QString &s) { return s.toUtf8(); });
@@ -434,7 +434,7 @@ static GpgME::KeyListResult listKeys(GpgME::Protocol protocol, const QStringList
     pattern.push_back(0);
 
     GpgME::initializeLibrary();
-    auto ctx = QSharedPointer<GpgME::Context>{GpgME::Context::createForProtocol(protocol)};
+    auto ctx = QSharedPointer<GpgME::Context>{GpgME::Context::createForProtocol(GpgME::OpenPGP)};
     ctx->setKeyListMode(keyListMode);
     if (const GpgME::Error err = ctx->startKeyListing(pattern.data(), secretOnly)) {
         return GpgME::KeyListResult(0, err);
@@ -452,10 +452,10 @@ static GpgME::KeyListResult listKeys(GpgME::Protocol protocol, const QStringList
     return result;
 }
 
-std::vector<GpgME::Key> MailCrypto::findKeys(const QStringList &filter, bool findPrivate, bool remote, Protocol protocol)
+std::vector<GpgME::Key> MailCrypto::findKeys(const QStringList &filter, bool findPrivate, bool remote)
 {
     std::vector<GpgME::Key> keys;
-    GpgME::KeyListResult res = listKeys(protocol == SMIME ? GpgME::CMS : GpgME::OpenPGP, filter, findPrivate, remote ? GpgME::Extern : GpgME::Local, keys);
+    GpgME::KeyListResult res = listKeys(filter, findPrivate, remote ? GpgME::Extern : GpgME::Local, keys);
     if (res.error()) {
         qWarning() << "Failed to lookup keys: " << res.error().asString();
         return keys;
diff --git a/framework/src/domain/mime/mailcrypto.h b/framework/src/domain/mime/mailcrypto.h
index 724d6427..89343fc9 100644
--- a/framework/src/domain/mime/mailcrypto.h
+++ b/framework/src/domain/mime/mailcrypto.h
@@ -19,18 +19,18 @@
 
 #pragma once
 
-#include <QByteArray>
 #include <KMime/Message>
-#include <gpgme++/key.h>
+#include <QByteArray>
 #include <functional>
+#include <gpgme++/key.h>
+
+namespace MailCrypto {
+
+KMime::Content *processCrypto(KMime::Content *content, const std::vector<GpgME::Key> &signingKeys,
+    const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey);
+
+std::vector<GpgME::Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false);
+
+void importKeys(const std::vector<GpgME::Key> &keys);
 
-namespace MailCrypto
-{
-    enum Protocol {
-        OPENPGP,
-        SMIME
-    };
-    KMime::Content *processCrypto(KMime::Content *content, const std::vector<GpgME::Key> &signingKeys, const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey, MailCrypto::Protocol protocol);
-    std::vector<GpgME::Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false, Protocol protocol = OPENPGP);
-    void importKeys(const std::vector<GpgME::Key> &keys);
-};
+}; // namespace MailCrypto
diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 399b6aa1..09932e86 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -1094,7 +1094,7 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
     QByteArray bodyData;
     if (!signingKeys.empty() || !encryptionKeys.empty()) {
         auto result = MailCrypto::processCrypto(
-            bodyPart.get(), signingKeys, encryptionKeys, attachedKey, MailCrypto::OPENPGP);
+            bodyPart.get(), signingKeys, encryptionKeys, attachedKey);
         if (!result) {
             qWarning() << "Signing failed";
             return {};
-- 
cgit v1.2.3