From 2874ebd5e56a7da7f7e7c96da392199b296d909a Mon Sep 17 00:00:00 2001 From: Saturneric Date: Fri, 17 Dec 2021 02:18:38 +0800 Subject: Fixed & Improve. 1. Fixed Known Issues. 2. Improve UI. --- src/gpg/function/GpgKeyOpera.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/gpg/function/GpgKeyOpera.cpp') diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp index cdf5ab24..4bad303d 100644 --- a/src/gpg/function/GpgKeyOpera.cpp +++ b/src/gpg/function/GpgKeyOpera.cpp @@ -66,8 +66,6 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire( std::unique_ptr& expires) { unsigned long expires_time = 0; - LOG(INFO) << "expires" << *expires; - if (expires != nullptr) { using namespace boost::posix_time; using namespace std::chrono; @@ -78,7 +76,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire( LOG(INFO) << key.id() << subkey_fpr << expires_time; GpgError err; - if (subkey_fpr.empty()) + if (key.fpr() == subkey_fpr || subkey_fpr.empty()) err = gpgme_op_setexpire(ctx, gpgme_key_t(key), expires_time, nullptr, 0); else err = gpgme_op_setexpire(ctx, gpgme_key_t(key), expires_time, -- cgit v1.2.3