Remove protocol differentiation since we only use OpenPGP

1 files changed, 5 insertions, 5 deletions

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;