From c3b183831db5a2a490ba49bf4804730679eb59d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 4 Aug 2022 12:06:15 +0200 Subject: qt: Remove job for refreshing OpenPGP keys * lang/qt/src/qgpgmerefreshopenpgpkeysjob.cpp, lang/qt/src/qgpgmerefreshopenpgpkeysjob.h, lang/qt/src/refreshopenpgpkeysjob.h: Remove. * lang/qt/src/Makefile.am, lang/qt/src/job.cpp: Update accordingly. * lang/qt/src/protocol.h (class Protocol): Remove pure virtual member function refreshOpenPGPKeysJob. * lang/qt/src/protocol_p.h (Protocol::refreshOpenPGPKeysJob): Remove. * lang/qt/tests/run-refreshkeysjob.cpp (main): Use ReceiveKeysJob for OpenPGP keys. -- The RefreshOpenPGPKeysJob did more than it was intended to do, e.g. it imported new keys with the email addresses of the key to be refreshed via the configured auto-key-locate methods, but only a refresh from the key servers is wanted. For this we can use the ReceiveKeysJob. This commit mostly reverts the commits e12861f18c6b431b40bfa78eb6f1d149690a5fcd c64a8daf507a2216611861a12f312466b0bae8b2 The changes are source- and binary-compatible to the last release. GnuPG-bug-id: 5951 --- lang/qt/src/protocol.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'lang/qt/src/protocol.h') diff --git a/lang/qt/src/protocol.h b/lang/qt/src/protocol.h index f0772eef..7c24186c 100644 --- a/lang/qt/src/protocol.h +++ b/lang/qt/src/protocol.h @@ -59,7 +59,6 @@ class VerifyOpaqueJob; class SignEncryptJob; class DecryptVerifyJob; class RefreshKeysJob; -class RefreshOpenPGPKeysJob; class ChangeExpiryJob; class ChangeOwnerTrustJob; class ChangePasswdJob; @@ -140,7 +139,7 @@ public: /** * For S/MIME keys this job performs a full validation check of the keys * with updated CRLs. - * For OpenPGP keys, use refreshOpenPGPKeysJob. + * For OpenPGP keys, use receiveKeysJob. */ virtual RefreshKeysJob *refreshKeysJob() const = 0; virtual ChangeExpiryJob *changeExpiryJob() const = 0; @@ -183,13 +182,6 @@ public: virtual ReceiveKeysJob *receiveKeysJob() const = 0; virtual RevokeKeyJob *revokeKeyJob() const = 0; - - /** - * This job performs a refresh of OpenPGP keys via the external methods - * as defined by the \c auto-key-locate option and via an import from the - * configured keyserver. - */ - virtual RefreshOpenPGPKeysJob *refreshOpenPGPKeysJob() const = 0; }; /** Obtain a reference to the OpenPGP Protocol. -- cgit v1.2.3