fix: "auto-key-retrieve" instead of "auto-key-import"

4 files changed, 14 insertions, 16 deletions

diff --git a/src/core/function/gpg/GpgContext.cpp b/src/core/function/gpg/GpgContext.cpp
index 7c84d3c4..7dec318e 100644
--- a/src/core/function/gpg/GpgContext.cpp
+++ b/src/core/function/gpg/GpgContext.cpp
@@ -94,18 +94,18 @@ class GpgContext::Impl {
                                int fd) -> gpgme_error_t {
     size_t res;
 #ifdef QT5_BUILD
-     QString pass_qstr = "abcdefg\n";
-     QByteArray pass = pass_qstr.toUtf8();
+    QString pass_qstr = "abcdefg\n";
+    QByteArray pass = pass_qstr.toUtf8();
 #else
-      QString pass = "abcdefg\n";
+    QString pass = "abcdefg\n";
 #endif
-    
+
     auto passpahrase_size = pass.size();
     size_t off = 0;
 
     do {
 #ifdef QT5_BUILD
-      const char* p_pass = pass.data();
+      const char *p_pass = pass.data();
       res = gpgme_io_write(fd, &p_pass[off], passpahrase_size - off);
 #else
       res = gpgme_io_write(fd, &pass[off], passpahrase_size - off);
@@ -246,15 +246,14 @@ class GpgContext::Impl {
     }
 
     // set context offline mode
-    GF_CORE_LOG_DEBUG("gpg context offline mode: {}", args_.offline_mode);
+    GF_CORE_LOG_DEBUG("gpg context: offline mode: {}", args_.offline_mode);
+    GF_CORE_LOG_DEBUG("gpg context: auto import missing key: {}",
+                      args_.auto_import_missing_key);
     gpgme_set_offline(ctx, args_.offline_mode ? 1 : 0);
 
     // set option auto import missing key
-    // invalid at offline mode
-    GF_CORE_LOG_DEBUG("gpg context auto import missing key: {}",
-                      args_.offline_mode);
-    if (!args.offline_mode && args.auto_import_missing_key) {
-      if (CheckGpgError(gpgme_set_ctx_flag(ctx, "auto-key-import", "1")) !=
+    if (!args_.offline_mode && args.auto_import_missing_key) {
+      if (CheckGpgError(gpgme_set_ctx_flag(ctx, "auto-key-retrieve", "1")) !=
           GPG_ERR_NO_ERROR) {
         return false;
       }
diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp
index 1fd5c3bb..806ceb9e 100644
--- a/src/ui/UserInterfaceUtils.cpp
+++ b/src/ui/UserInterfaceUtils.cpp
@@ -65,8 +65,8 @@ void show_verify_details(QWidget *parent, InfoBoardWidget *info_board,
       [=]() { VerifyDetailsDialog(parent, error, verify_result); });
 }
 
-void import_unknown_key_from_keyserver(
-    QWidget *parent, const GpgVerifyResultAnalyse &verify_res) {
+void ImportUnknownKeyFromKeyserver(
+    QWidget *parent, const GpgVerifyResultAnalyse &verify_result) {
   QMessageBox::StandardButton reply;
   reply = QMessageBox::question(
       parent, QCoreApplication::tr("Public key not found locally"),
@@ -78,7 +78,7 @@ void import_unknown_key_from_keyserver(
   if (reply == QMessageBox::Yes) {
     auto dialog = KeyServerImportDialog(parent);
     auto key_ids = std::make_unique<KeyIdArgsList>();
-    auto *signature = verify_res.GetSignatures();
+    auto *signature = verify_result.GetSignatures();
     while (signature != nullptr) {
       GF_UI_LOG_DEBUG("signature fpr: {}", signature->fpr);
       key_ids->push_back(signature->fpr);
diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h
index 728e825f..304ba37b 100644
--- a/src/ui/UserInterfaceUtils.h
+++ b/src/ui/UserInterfaceUtils.h
@@ -63,7 +63,7 @@ void show_verify_details(QWidget* parent, InfoBoardWidget* info_board,
  * @param parent
  * @param verify_res
  */
-void import_unknown_key_from_keyserver(
+void ImportUnknownKeyFromKeyserver(
     QWidget* parent, const GpgVerifyResultAnalyse& verify_res);
 
 /**
diff --git a/src/ui/dialog/settings/SettingsNetwork.cpp b/src/ui/dialog/settings/SettingsNetwork.cpp
index a923e5a2..2fb35084 100644
--- a/src/ui/dialog/settings/SettingsNetwork.cpp
+++ b/src/ui/dialog/settings/SettingsNetwork.cpp
@@ -97,7 +97,6 @@ GpgFrontend::UI::NetworkTab::NetworkTab(QWidget *parent)
   ui_->networkAbilityTipsLabel->setText(
       tr("Tips: These Option Changes take effect only after the "
          "application restart."));
-
   SetSettings();
 }