fix: according to issues and test, apply some fixesv2.1.4

3 files changed, 15 insertions, 10 deletions

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);