From 86927d185fec4d4621aa6d7744a88285fcf233b7 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 24 Nov 2017 18:30:51 +0100
Subject: Import missing keys

---
 framework/src/domain/mime/mailcrypto.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/framework/src/domain/mime/mailcrypto.cpp b/framework/src/domain/mime/mailcrypto.cpp
index 6c5d1b4f..8cf55089 100644
--- a/framework/src/domain/mime/mailcrypto.cpp
+++ b/framework/src/domain/mime/mailcrypto.cpp
@@ -25,10 +25,12 @@
 #include <QGpgME/EncryptJob>
 #include <QGpgME/SignEncryptJob>
 #include <QGpgME/KeyListJob>
+#include <QGpgME/ImportFromKeyserverJob>
 #include <gpgme++/global.h>
 #include <gpgme++/signingresult.h>
 #include <gpgme++/encryptionresult.h>
 #include <gpgme++/keylistresult.h>
+#include <gpgme++/importresult.h>
 #include <QDebug>
 
 /*
@@ -460,11 +462,20 @@ KMime::Content *MailCrypto::sign(KMime::Content *content, const std::vector<GpgM
     return processCrypto(content, signers, {}, OPENPGP);
 }
 
-std::vector<GpgME::Key> MailCrypto::findKeys(const QStringList &filter, bool findPrivate, Protocol protocol)
+
+void MailCrypto::importKeys(const std::vector<GpgME::Key> &keys)
+{
+    const QGpgME::Protocol *const backend = QGpgME::openpgp();
+    Q_ASSERT(backend);
+    auto *job = backend->importFromKeyserverJob();
+    job->exec(keys);
+}
+
+std::vector<GpgME::Key> MailCrypto::findKeys(const QStringList &filter, bool findPrivate, bool remote, Protocol protocol)
 {
     const QGpgME::Protocol *const backend = protocol == SMIME ? QGpgME::smime() : QGpgME::openpgp();
     Q_ASSERT(backend);
-    QGpgME::KeyListJob *job = backend->keyListJob(false);
+    QGpgME::KeyListJob *job = backend->keyListJob(remote);
     Q_ASSERT(job);
 
     std::vector<GpgME::Key> keys;
-- 
cgit v1.2.3