Verified Commit 8e527a1d authored by Ingo Klöcker's avatar Ingo Klöcker Committed by Ingo Klöcker
Browse files

Do not bother users with errors during WKD lookup

Most users won't even know that a WKD lookup happens additionally to the
keyserver lookup. Moreover, the errors will most likely be caused by
servers that do not support WKD and there's little most users can do
about this.

GnuPG-bug-id: 6202
parent 0f4b3205
Pipeline #232866 passed with stage
in 2 minutes and 22 seconds
......@@ -30,6 +30,7 @@
#include <Libkleo/Stl_Util>
#include <QGpgME/CryptoConfig>
#include <QGpgME/Debug>
#include <QGpgME/Protocol>
#include <QGpgME/KeyListJob>
#include <QGpgME/ImportFromKeyserverJob>
......@@ -402,7 +403,9 @@ void LookupCertificatesCommand::Private::slotWKDLookupResult(const WKDLookupResu
qCDebug(KLEOPATRA_LOG) << __func__ << "unknown sender()" << q->sender();
}
keyListing.result.mergeWith(KeyListResult{result.error()});
// we do not want to bother the user with errors during the WKD lookup;
// therefore, we log the result, but we do not merge it into keyListing.result
qCDebug(KLEOPATRA_LOG) << "Result of WKD lookup:" << result.error();
const auto keys = removeKeysNotMatchingEmail(result.keyData().toKeys(GpgME::OpenPGP), result.pattern());
if (!keys.empty()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment