fix: key server adding or switching is actually not working

9 files changed, 36 insertions, 19 deletions

diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp
index c6be2715..0f462cf7 100644
--- a/src/ui/UserInterfaceUtils.cpp
+++ b/src/ui/UserInterfaceUtils.cpp
@@ -560,7 +560,7 @@ void CommonUtils::RemoveKeyFromFavourite(const GpgKey &key) {
  *
  */
 void CommonUtils::ImportKeyFromKeyServer(const KeyIdArgsList &key_ids) {
-  KeyServerSO key_server(SettingsObject("general_settings_state"));
+  KeyServerSO key_server(SettingsObject("key_server"));
   auto target_keyserver = key_server.GetTargetServer();
 
   auto *task = new KeyServerImportTask(target_keyserver, key_ids);
diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
index 47d80090..e1d2be72 100644
--- a/src/ui/dialog/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
@@ -125,12 +125,15 @@ auto KeyServerImportDialog::create_combo_box() -> QComboBox* {
   combo_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
   try {
-    KeyServerSO key_server(SettingsObject("general_settings_state"));
+    KeyServerSO key_server(SettingsObject("key_server"));
     const auto& key_server_list = key_server.server_list;
     for (const auto& key_server : key_server_list) {
       combo_box->addItem(key_server);
     }
-    combo_box->setCurrentText(key_server.GetTargetServer());
+    auto target_key_server = key_server.GetTargetServer();
+    LOG_D() << "set combo box to key server: " << target_key_server;
+
+    combo_box->setCurrentText(target_key_server);
   } catch (...) {
     FLOG_W("setting operation error server_list default_server");
   }
@@ -207,7 +210,7 @@ void KeyServerImportDialog::slot_search() {
 }
 
 void KeyServerImportDialog::slot_search_finished(
-    QNetworkReply::NetworkError error, QByteArray buffer) {
+    QNetworkReply::NetworkError error, QString err_string, QByteArray buffer) {
   keys_table_->clearContents();
   keys_table_->setRowCount(0);
 
@@ -226,6 +229,7 @@ void KeyServerImportDialog::slot_search_finished(
         break;
       default:
         set_message(tr("Connection Error"), true);
+        QMessageBox::critical(this, tr("Connection Error"), err_string);
     }
     return;
   }
@@ -380,7 +384,7 @@ void KeyServerImportDialog::SlotImport(const KeyIdArgsListPtr& keys) {
     target_keyserver = key_server_combo_box_->currentText();
   }
   if (target_keyserver.isEmpty()) {
-    KeyServerSO key_server(SettingsObject("general_settings_state"));
+    KeyServerSO key_server(SettingsObject("key_server"));
     target_keyserver = key_server.GetTargetServer();
   }
   std::vector<QString> key_ids;
diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.h b/src/ui/dialog/import_export/KeyServerImportDialog.h
index 366e214d..3af381e7 100644
--- a/src/ui/dialog/import_export/KeyServerImportDialog.h
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.h
@@ -90,7 +90,7 @@ class KeyServerImportDialog : public GeneralDialog {
    *
    */
   void slot_search_finished(QNetworkReply::NetworkError reply,
-                            QByteArray buffer);
+                            QString err_string, QByteArray buffer);
 
   /**
    * @brief
diff --git a/src/ui/dialog/import_export/KeyUploadDialog.cpp b/src/ui/dialog/import_export/KeyUploadDialog.cpp
index a19f02f2..80408107 100644
--- a/src/ui/dialog/import_export/KeyUploadDialog.cpp
+++ b/src/ui/dialog/import_export/KeyUploadDialog.cpp
@@ -94,11 +94,12 @@ void KeyUploadDialog::SlotUpload() {
 
 void KeyUploadDialog::slot_upload_key_to_server(
     const GpgFrontend::GFBuffer& keys_data) {
-  KeyServerSO key_server(SettingsObject("general_settings_state"));
-  auto target_keyserver = key_server.GetTargetServer();
+  KeyServerSO key_server(SettingsObject("key_server"));
+  auto target_key_server = key_server.GetTargetServer();
 
-  QUrl req_url(target_keyserver + "/pks/add");
-  auto* qnam = new QNetworkAccessManager(this);
+  LOG_D() << "upload public key using key server" << target_key_server;
+  QUrl req_url(target_key_server + "/pks/add");
+  auto* q_nam = new QNetworkAccessManager(this);
 
   // Building Post Data
   QByteArray post_data;
@@ -124,7 +125,7 @@ void KeyUploadDialog::slot_upload_key_to_server(
   post_data.append("keytext").append("=").append(data);
 
   // Send Post Data
-  QNetworkReply* reply = qnam->post(request, post_data);
+  QNetworkReply* reply = q_nam->post(request, post_data);
   connect(reply, &QNetworkReply::finished, this,
           &KeyUploadDialog::slot_upload_finished);
 
diff --git a/src/ui/dialog/settings/SettingsKeyServer.cpp b/src/ui/dialog/settings/SettingsKeyServer.cpp
index 5ba03740..38256c8e 100644
--- a/src/ui/dialog/settings/SettingsKeyServer.cpp
+++ b/src/ui/dialog/settings/SettingsKeyServer.cpp
@@ -94,7 +94,7 @@ KeyserverTab::KeyserverTab(QWidget* parent)
   connect(ui_->actionSet_As_Default, &QAction::triggered, [=]() {
     const auto row_size = ui_->keyServerListTable->rowCount();
     for (int i = 0; i < row_size; i++) {
-      const auto item = ui_->keyServerListTable->item(i, 1);
+      auto* const item = ui_->keyServerListTable->item(i, 1);
       if (!item->isSelected()) continue;
       this->default_key_server_ = item->text();
     }
@@ -164,18 +164,21 @@ void KeyserverTab::slot_add_key_server() {
 
 void KeyserverTab::ApplySettings() {
   SettingsObject key_server_json("key_server");
-  KeyServerSO key_server;
+  KeyServerSO key_server_so;
 
-  auto& key_server_list = key_server.server_list;
+  auto& key_server_list = key_server_so.server_list;
   const auto list_size = key_server_str_list_.size();
   for (int i = 0; i < list_size; i++) {
     const auto key_server = key_server_str_list_[i];
     if (default_key_server_ == key_server) {
-      key_server_json["default_server"] = i;
+      LOG_D() << "set default key server as:" << default_key_server_
+              << "index: " << i;
+      key_server_so.default_server = i;
     }
     key_server_list << key_server;
   }
-  key_server_json.Store(key_server.ToJson());
+  LOG_D() << "key server settings json:" << key_server_so.ToJson();
+  key_server_json.Store(key_server_so.ToJson());
 }
 
 void KeyserverTab::slot_refresh_table() {
diff --git a/src/ui/struct/settings_object/KeyServerSO.h b/src/ui/struct/settings_object/KeyServerSO.h
index bec829e4..3c508eaf 100644
--- a/src/ui/struct/settings_object/KeyServerSO.h
+++ b/src/ui/struct/settings_object/KeyServerSO.h
@@ -65,6 +65,9 @@ struct KeyServerSO {
   }
 
   auto GetTargetServer() -> QString {
+    LOG_D() << "default key server index" << default_server
+            << "server list size" << server_list.size();
+
     if (server_list.empty()) this->ResetDefaultServerList();
     if (default_server >= server_list.size()) default_server = 0;
     return server_list[default_server];
diff --git a/src/ui/thread/KeyServerImportTask.cpp b/src/ui/thread/KeyServerImportTask.cpp
index 0abeb944..4a1b0e13 100644
--- a/src/ui/thread/KeyServerImportTask.cpp
+++ b/src/ui/thread/KeyServerImportTask.cpp
@@ -42,7 +42,7 @@ GpgFrontend::UI::KeyServerImportTask::KeyServerImportTask(
   HoldOnLifeCycle(true);
 
   if (keyserver_url_.isEmpty()) {
-    KeyServerSO key_server(SettingsObject("general_settings_state"));
+    KeyServerSO key_server(SettingsObject("key_server"));
     keyserver_url_ = key_server.GetTargetServer();
   }
 }
diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp
index 704899a4..2f7f08a7 100644
--- a/src/ui/thread/KeyServerSearchTask.cpp
+++ b/src/ui/thread/KeyServerSearchTask.cpp
@@ -61,6 +61,12 @@ void GpgFrontend::UI::KeyServerSearchTask::dealing_reply_from_server() {
   if (network_reply == QNetworkReply::NoError) {
     buffer = reply_->readAll();
   }
-  emit SignalKeyServerSearchResult(network_reply, buffer);
+
+  LOG_D() << "reply from key server:" << network_reply
+          << "err string:" << reply_->errorString()
+          << "reply:" << QString::fromLatin1(buffer);
+
+  emit SignalKeyServerSearchResult(network_reply, reply_->errorString(),
+                                   buffer);
   emit SignalTaskShouldEnd(0);
 }
diff --git a/src/ui/thread/KeyServerSearchTask.h b/src/ui/thread/KeyServerSearchTask.h
index d602e537..df247761 100644
--- a/src/ui/thread/KeyServerSearchTask.h
+++ b/src/ui/thread/KeyServerSearchTask.h
@@ -60,7 +60,7 @@ class KeyServerSearchTask : public Thread::Task {
    * @param result
    */
   void SignalKeyServerSearchResult(QNetworkReply::NetworkError reply,
-                                   QByteArray buffer);
+                                   QString err_string, QByteArray buffer);
 
  private slots: