Merge pull request #93 from saturneric/dev/2.0.10/mainv2.1.0

Develop 2.1.0.2

2 files changed, 41 insertions, 21 deletions

diff --git a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
index e9b1af93..32ae63fa 100644
--- a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
+++ b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
@@ -124,7 +124,6 @@ void KeyImportDetailDialog::create_general_info_box() {
         new QLabel(QString(_("Private Unchanged")) + ": "), row, 0);
     generalInfoBoxLayout->addWidget(
         new QLabel(QString::number(m_result_.secret_unchanged)), row, 1);
-    row++;
   }
 }
 
@@ -162,36 +161,36 @@ void KeyImportDetailDialog::create_keys_table() {
   keys_table_->resizeColumnsToContents();
 }
 
-QString KeyImportDetailDialog::get_status_string(int keyStatus) {
-  QString statusString;
+QString KeyImportDetailDialog::get_status_string(int key_status) {
+  QString status_string;
   // keystatus is greater than 15, if key is private
-  if (keyStatus > 15) {
-    statusString.append(_("Private"));
-    keyStatus = keyStatus - 16;
+  if (key_status > 15) {
+    status_string.append(_("Private"));
+    key_status = key_status - 16;
   } else {
-    statusString.append(_("Public"));
+    status_string.append(_("Public"));
   }
-  if (keyStatus == 0) {
-    statusString.append(", " + QString(_("Unchanged")));
+  if (key_status == 0) {
+    status_string.append(", " + QString(_("Unchanged")));
   } else {
-    if (keyStatus == 1) {
-      statusString.append(", " + QString(_("New Key")));
+    if (key_status == 1) {
+      status_string.append(", " + QString(_("New Key")));
     } else {
-      if (keyStatus > 7) {
-        statusString.append(", " + QString(_("New Subkey")));
-        keyStatus = keyStatus - 8;
+      if (key_status > 7) {
+        status_string.append(", " + QString(_("New Subkey")));
+        return status_string;
       }
-      if (keyStatus > 3) {
-        statusString.append(", " + QString(_("New Signature")));
-        keyStatus = keyStatus - 4;
+      if (key_status > 3) {
+        status_string.append(", " + QString(_("New Signature")));
+        return status_string;
       }
-      if (keyStatus > 1) {
-        statusString.append(", " + QString(_("New UID")));
-        keyStatus = keyStatus - 2;
+      if (key_status > 1) {
+        status_string.append(", " + QString(_("New UID")));
+        return status_string;
       }
     }
   }
-  return statusString;
+  return status_string;
 }
 
 void KeyImportDetailDialog::create_button_box() {
diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
index 713c5a58..5692f607 100644
--- a/src/ui/dialog/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
@@ -47,6 +47,23 @@ KeyServerImportDialog::KeyServerImportDialog(bool automatic, QWidget* parent)
   // Layout for messagebox
   auto* message_layout = new QHBoxLayout();
 
+  // get settings
+  auto& settings = GlobalSettingStation::GetInstance().GetUISettings();
+  // read settings
+  bool forbid_all_gnupg_connection = false;
+  try {
+    forbid_all_gnupg_connection =
+        settings.lookup("network.forbid_all_gnupg_connection");
+  } catch (...) {
+    SPDLOG_ERROR("setting operation error: forbid_all_gnupg_connection");
+  }
+
+  if (forbid_all_gnupg_connection) {
+    QMessageBox::critical(this, "Forbidden", "GnuPG is in offline mode now.");
+    this->close();
+    this->deleteLater();
+  }
+
   if (automatic) {
     setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
   } else {
@@ -249,6 +266,10 @@ void KeyServerImportDialog::slot_search() {
   Thread::TaskRunnerGetter::GetInstance()
       .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Network)
       ->PostTask(task);
+
+  QEventLoop loop;
+  connect(task, &Thread::Task::SignalTaskEnd, &loop, &QEventLoop::quit);
+  loop.exec();
 }
 
 void KeyServerImportDialog::slot_search_finished(