1 files changed, 115 insertions, 131 deletions

diff --git a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
index abf17c67..eecf2a1d 100644
--- a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021 Saturneric
+ * Copyright (C) 2021 Saturneric <[email protected]>
  *
  * This file is part of GpgFrontend.
  *
@@ -19,21 +19,25 @@
  * The initial version of the source code is inherited from
  * the gpg4usb project, which is under GPL-3.0-or-later.
  *
- * The source code version of this software was modified and released
- * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021.
+ * All the source code of GpgFrontend was modified and released by
+ * Saturneric <[email protected]> starting on May 12, 2021.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
 
 #include "SubkeyGenerateDialog.h"
 
 #include <cassert>
+#include <cstddef>
 
-#include "core/common/CoreCommonUtil.h"
 #include "core/function/GlobalSettingStation.h"
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyOpera.h"
-#include "ui/SignalStation.h"
-#include "ui/dialog/WaitingDialog.h"
+#include "core/utils/CacheUtils.h"
+#include "core/utils/GpgUtils.h"
+#include "ui/UISignalStation.h"
+#include "ui/UserInterfaceUtils.h"
 
 namespace GpgFrontend::UI {
 
@@ -41,14 +45,10 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(const KeyId& key_id, QWidget* parent)
     : GeneralDialog(typeid(SubkeyGenerateDialog).name(), parent),
       key_(GpgKeyGetter::GetInstance().GetKey(key_id)) {
   bool longer_expiration_date =
-      GlobalSettingStation::GetInstance().LookupSettings(
-          "general.longer_expiration_date", false);
-
-  bool use_pinentry_as_password_input_dialog =
-      GlobalSettingStation::GetInstance().LookupSettings(
-          "general.use_pinentry_as_password_input_dialog", false);
-
-  use_pinentry_ = use_pinentry_as_password_input_dialog;
+      GlobalSettingStation::GetInstance()
+          .GetSettings()
+          .value("basic/longer_expiration_date", false)
+          .toBool();
 
   max_date_time_ = longer_expiration_date
                        ? QDateTime::currentDateTime().toLocalTime().addYears(30)
@@ -63,9 +63,10 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(const KeyId& key_id, QWidget* parent)
   group_grid->addWidget(create_basic_info_group_box(), 0, 0);
   group_grid->addWidget(key_usage_group_box_, 1, 0);
 
-  auto* tipps_label = new QLabel(
-      QString(_("Tipps: if the key pair has a passphrase, the subkey's "
-                "passphrase must be equal to it.")));
+  auto* tipps_label =
+      new QLabel(tr("Tipps: if the key pair has a passphrase, the subkey's "
+                    "passphrase must be equal to it."));
+  tipps_label->setWordWrap(true);
   group_grid->addWidget(tipps_label);
 
   auto* name_list = new QWidget(this);
@@ -76,34 +77,31 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(const KeyId& key_id, QWidget* parent)
   vbox2->addWidget(error_label_);
   vbox2->addWidget(button_box_);
 
-  this->setWindowTitle(_("Generate New Subkey"));
+  this->setWindowTitle(tr("Generate New Subkey"));
   this->setLayout(vbox2);
+  this->setAttribute(Qt::WA_DeleteOnClose);
   this->setModal(true);
 
-  connect(this, &SubkeyGenerateDialog::SignalSubKeyGenerated,
-          SignalStation::GetInstance(),
-          &SignalStation::SignalKeyDatabaseRefresh);
-
   set_signal_slot();
   refresh_widgets_state();
 }
 
 QGroupBox* SubkeyGenerateDialog::create_key_usage_group_box() {
-  auto* groupBox = new QGroupBox(this);
+  auto* group_box = new QGroupBox(this);
   auto* grid = new QGridLayout(this);
 
-  groupBox->setTitle(_("Key Usage"));
+  group_box->setTitle(tr("Key Usage"));
 
-  auto* encrypt = new QCheckBox(_("Encryption"), groupBox);
+  auto* encrypt = new QCheckBox(tr("Encryption"), group_box);
   encrypt->setTristate(false);
 
-  auto* sign = new QCheckBox(_("Signing"), groupBox);
+  auto* sign = new QCheckBox(tr("Signing"), group_box);
   sign->setTristate(false);
 
-  auto* cert = new QCheckBox(_("Certification"), groupBox);
+  auto* cert = new QCheckBox(tr("Certification"), group_box);
   cert->setTristate(false);
 
-  auto* auth = new QCheckBox(_("Authentication"), groupBox);
+  auto* auth = new QCheckBox(tr("Authentication"), group_box);
   auth->setTristate(false);
 
   key_usage_check_boxes_.push_back(encrypt);
@@ -116,9 +114,9 @@ QGroupBox* SubkeyGenerateDialog::create_key_usage_group_box() {
   grid->addWidget(cert, 1, 0);
   grid->addWidget(auth, 1, 1);
 
-  groupBox->setLayout(grid);
+  group_box->setLayout(grid);
 
-  return groupBox;
+  return group_box;
 }
 
 QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
@@ -126,10 +124,9 @@ QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
   key_size_spin_box_ = new QSpinBox(this);
   key_type_combo_box_ = new QComboBox(this);
   no_pass_phrase_check_box_ = new QCheckBox(this);
-  passphrase_edit_ = new QLineEdit(this);
 
-  for (auto& algo : GenKeyInfo::GetSupportedSubkeyAlgo()) {
-    key_type_combo_box_->addItem(QString::fromStdString(algo.first));
+  for (const auto& algo : GenKeyInfo::GetSupportedSubkeyAlgo()) {
+    key_type_combo_box_->addItem(std::get<0>(algo));
   }
   if (!GenKeyInfo::GetSupportedSubkeyAlgo().empty()) {
     key_type_combo_box_->setCurrentIndex(0);
@@ -146,31 +143,25 @@ QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
   expire_check_box_ = new QCheckBox(this);
   expire_check_box_->setCheckState(Qt::Unchecked);
 
-  passphrase_edit_->setEchoMode(QLineEdit::Password);
-  passphrase_edit_->setHidden(use_pinentry_);
-
   auto* vbox1 = new QGridLayout;
 
-  vbox1->addWidget(new QLabel(QString(_("Key Type")) + ": "), 0, 0);
-  vbox1->addWidget(new QLabel(QString(_("KeySize (in Bit)")) + ": "), 1, 0);
-  vbox1->addWidget(new QLabel(QString(_("Expiration Date")) + ": "), 2, 0);
-  vbox1->addWidget(new QLabel(QString(_("Never Expire"))), 2, 3);
-  if (!use_pinentry_)
-    vbox1->addWidget(new QLabel(QString(_("Password")) + ": "), 3, 0);
-  vbox1->addWidget(new QLabel(QString(_("Non Pass Phrase"))), 3, 3);
+  vbox1->addWidget(new QLabel(tr("Key Type") + ": "), 0, 0);
+  vbox1->addWidget(new QLabel(tr("KeySize (in Bit)") + ": "), 1, 0);
+  vbox1->addWidget(new QLabel(tr("Expiration Date") + ": "), 2, 0);
+  vbox1->addWidget(new QLabel(tr("Never Expire")), 2, 3);
+  vbox1->addWidget(new QLabel(tr("Non Pass Phrase")), 3, 0);
 
   vbox1->addWidget(key_type_combo_box_, 0, 1);
   vbox1->addWidget(key_size_spin_box_, 1, 1);
   vbox1->addWidget(date_edit_, 2, 1);
   vbox1->addWidget(expire_check_box_, 2, 2);
-  if (!use_pinentry_) vbox1->addWidget(passphrase_edit_, 3, 1);
-  vbox1->addWidget(no_pass_phrase_check_box_, 3, 2);
+  vbox1->addWidget(no_pass_phrase_check_box_, 3, 1);
 
-  auto basicInfoGroupBox = new QGroupBox();
-  basicInfoGroupBox->setLayout(vbox1);
-  basicInfoGroupBox->setTitle(_("Basic Information"));
+  auto* basic_info_group_box = new QGroupBox();
+  basic_info_group_box->setLayout(vbox1);
+  basic_info_group_box->setTitle(tr("Basic Information"));
 
-  return basicInfoGroupBox;
+  return basic_info_group_box;
 }
 
 void SubkeyGenerateDialog::set_signal_slot() {
@@ -197,12 +188,11 @@ void SubkeyGenerateDialog::set_signal_slot() {
   connect(no_pass_phrase_check_box_, &QCheckBox::stateChanged, this,
           [this](int state) -> void {
             gen_key_info_->SetNonPassPhrase(state != 0);
-            passphrase_edit_->setDisabled(state != 0);
           });
 }
 
 void SubkeyGenerateDialog::slot_expire_box_changed() {
-  if (expire_check_box_->checkState()) {
+  if (expire_check_box_->checkState() != 0U) {
     date_edit_->setEnabled(false);
   } else {
     date_edit_->setEnabled(true);
@@ -210,124 +200,116 @@ void SubkeyGenerateDialog::slot_expire_box_changed() {
 }
 
 void SubkeyGenerateDialog::refresh_widgets_state() {
-  if (gen_key_info_->IsAllowEncryption())
+  if (gen_key_info_->IsAllowEncryption()) {
     key_usage_check_boxes_[0]->setCheckState(Qt::CheckState::Checked);
-  else
+  } else {
     key_usage_check_boxes_[0]->setCheckState(Qt::CheckState::Unchecked);
+  }
 
-  if (gen_key_info_->IsAllowChangeEncryption())
+  if (gen_key_info_->IsAllowChangeEncryption()) {
     key_usage_check_boxes_[0]->setDisabled(false);
-  else
+  } else {
     key_usage_check_boxes_[0]->setDisabled(true);
+  }
 
-  if (gen_key_info_->IsAllowSigning())
+  if (gen_key_info_->IsAllowSigning()) {
     key_usage_check_boxes_[1]->setCheckState(Qt::CheckState::Checked);
-  else
+  } else {
     key_usage_check_boxes_[1]->setCheckState(Qt::CheckState::Unchecked);
+  }
 
-  if (gen_key_info_->IsAllowChangeSigning())
+  if (gen_key_info_->IsAllowChangeSigning()) {
     key_usage_check_boxes_[1]->setDisabled(false);
-  else
+  } else {
     key_usage_check_boxes_[1]->setDisabled(true);
+  }
 
-  if (gen_key_info_->IsAllowCertification())
+  if (gen_key_info_->IsAllowCertification()) {
     key_usage_check_boxes_[2]->setCheckState(Qt::CheckState::Checked);
-  else
+  } else {
     key_usage_check_boxes_[2]->setCheckState(Qt::CheckState::Unchecked);
+  }
 
-  if (gen_key_info_->IsAllowChangeCertification())
+  if (gen_key_info_->IsAllowChangeCertification()) {
     key_usage_check_boxes_[2]->setDisabled(false);
-  else
+  } else {
     key_usage_check_boxes_[2]->setDisabled(true);
+  }
 
-  if (gen_key_info_->IsAllowAuthentication())
+  if (gen_key_info_->IsAllowAuthentication()) {
     key_usage_check_boxes_[3]->setCheckState(Qt::CheckState::Checked);
-  else
+  } else {
     key_usage_check_boxes_[3]->setCheckState(Qt::CheckState::Unchecked);
+  }
 
-  if (gen_key_info_->IsAllowChangeAuthentication())
+  if (gen_key_info_->IsAllowChangeAuthentication()) {
     key_usage_check_boxes_[3]->setDisabled(false);
-  else
+  } else {
     key_usage_check_boxes_[3]->setDisabled(true);
+  }
 
-  key_size_spin_box_->setRange(gen_key_info_->GetSuggestMinKeySize(),
-                               gen_key_info_->GetSuggestMaxKeySize());
-  key_size_spin_box_->setValue(gen_key_info_->GetKeyLength());
-  key_size_spin_box_->setSingleStep(gen_key_info_->GetSizeChangeStep());
+  if (gen_key_info_->GetSuggestMinKeySize() == -1 ||
+      gen_key_info_->GetSuggestMaxKeySize() == -1) {
+    key_size_spin_box_->setDisabled(true);
+    key_size_spin_box_->setRange(0, 0);
+    key_size_spin_box_->setValue(0);
+    key_size_spin_box_->setSingleStep(0);
+  } else {
+    key_size_spin_box_->setDisabled(false);
+    key_size_spin_box_->setRange(gen_key_info_->GetSuggestMinKeySize(),
+                                 gen_key_info_->GetSuggestMaxKeySize());
+    key_size_spin_box_->setValue(gen_key_info_->GetKeyLength());
+    key_size_spin_box_->setSingleStep(gen_key_info_->GetSizeChangeStep());
+  }
 }
 
 void SubkeyGenerateDialog::slot_key_gen_accept() {
-  std::stringstream err_stream;
+  QString buffer;
+  QTextStream err_stream(&buffer);
 
   /**
    * primary keys should have a reasonable expiration date (no more than 2 years
    * in the future)
    */
   if (date_edit_->dateTime() > QDateTime::currentDateTime().addYears(2)) {
-    err_stream << "  " << _("Expiration time no more than 2 years.") << "  ";
+    err_stream << "  " << tr("Expiration time no more than 2 years.") << "  ";
   }
 
-  if (!use_pinentry_ && passphrase_edit_->isEnabled() &&
-      passphrase_edit_->text().size() == 0) {
-    err_stream << "  " << _("Password is empty.") << std::endl;
-  }
-
-  auto err_string = err_stream.str();
+  auto err_string = err_stream.readAll();
 
-  if (err_string.empty()) {
+  if (err_string.isEmpty()) {
     gen_key_info_->SetKeyLength(key_size_spin_box_->value());
 
-    if (expire_check_box_->checkState()) {
+    if (expire_check_box_->checkState() != 0U) {
       gen_key_info_->SetNonExpired(true);
     } else {
-#ifdef GPGFRONTEND_GUI_QT6
-      gen_key_info_->SetExpireTime(boost::posix_time::from_time_t(
-          date_edit_->dateTime().toSecsSinceEpoch()));
-#else
-      gen_key_info_->SetExpireTime(
-          boost::posix_time::from_time_t(date_edit_->dateTime().toTime_t()));
-#endif
-    }
-
-    if (!use_pinentry_ && !gen_key_info_->IsNoPassPhrase()) {
-      CoreCommonUtil::GetInstance()->SetTempCacheValue(
-          "__key_passphrase", this->passphrase_edit_->text().toStdString());
+      gen_key_info_->SetExpireTime(date_edit_->dateTime());
     }
 
-    GpgError error;
-    // TODO: remove plain qt thread usage
-    auto thread = QThread::create([&]() {
-      SPDLOG_DEBUG("thread started");
-      error = GpgKeyOpera::GetInstance().GenerateSubkey(key_, gen_key_info_);
-    });
-    thread->start();
-
-    auto* waiting_dialog = new WaitingDialog(_("Generating"), this);
-    waiting_dialog->show();
-
-    while (thread->isRunning()) {
-      QCoreApplication::processEvents();
-    }
-    waiting_dialog->close();
-
-    if (!use_pinentry_ && !gen_key_info_->IsNoPassPhrase()) {
-      CoreCommonUtil::GetInstance()->ResetTempCacheValue("__key_passphrase");
-    }
-
-    if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) {
-      auto* msg_box = new QMessageBox(qobject_cast<QWidget*>(this->parent()));
-      msg_box->setAttribute(Qt::WA_DeleteOnClose);
-      msg_box->setStandardButtons(QMessageBox::Ok);
-      msg_box->setWindowTitle(_("Success"));
-      msg_box->setText(_("The new subkey has been generated."));
-      msg_box->setModal(true);
-      msg_box->open();
-
-      emit SignalSubKeyGenerated();
-      this->close();
-    } else {
-      QMessageBox::critical(this, _("Failure"), _("Failed to generate key."));
-    }
+    CommonUtils::WaitForOpera(
+        this, tr("Generating"),
+        [this, key = this->key_,
+         gen_key_info = this->gen_key_info_](const OperaWaitingHd& hd) {
+          GpgKeyOpera::GetInstance().GenerateSubkey(
+              key, gen_key_info,
+              [this, hd](GpgError err, const DataObjectPtr&) {
+                // stop showing waiting dialog
+                hd();
+
+                if (CheckGpgError(err) == GPG_ERR_USER_1) {
+                  QMessageBox::critical(this, tr("Error"),
+                                        tr("Unknown error occurred"));
+                  return;
+                }
+
+                CommonUtils::RaiseMessageBox(this, err);
+                if (CheckGpgError(err) == GPG_ERR_NO_ERROR) {
+                  emit UISignalStation::GetInstance()
+                      ->SignalKeyDatabaseRefresh();
+                }
+              });
+        });
+    this->done(0);
 
   } else {
     /**
@@ -337,7 +319,7 @@ void SubkeyGenerateDialog::slot_key_gen_accept() {
     QPalette error = error_label_->palette();
     error.setColor(QPalette::Window, "#ff8080");
     error_label_->setPalette(error);
-    error_label_->setText(err_string.c_str());
+    error_label_->setText(err_string);
 
     this->show();
   }
@@ -376,11 +358,13 @@ void SubkeyGenerateDialog::slot_authentication_box_changed(int state) {
 }
 
 void SubkeyGenerateDialog::slot_activated_key_type(int index) {
-  SPDLOG_DEBUG("key type index changed: {}", index);
+  GF_UI_LOG_DEBUG("key type index changed: {}", index);
 
   // check
-  assert(gen_key_info_->GetSupportedSubkeyAlgo().size() > index);
-  gen_key_info_->SetAlgo(gen_key_info_->GetSupportedSubkeyAlgo()[index]);
+  assert(gen_key_info_->GetSupportedSubkeyAlgo().size() >
+         static_cast<size_t>(index));
+  gen_key_info_->SetAlgo(
+      std::get<2>(gen_key_info_->GetSupportedSubkeyAlgo()[index]));
   refresh_widgets_state();
 }