Merge pull request #109 from saturneric/dev/2.1.0/main

Develop 2.1.1.6

12 files changed, 194 insertions, 160 deletions

diff --git a/src/core/function/CacheManager.cpp b/src/core/function/CacheManager.cpp
index b24a8050..d9aead66 100644
--- a/src/core/function/CacheManager.cpp
+++ b/src/core/function/CacheManager.cpp
@@ -64,7 +64,6 @@ void GpgFrontend::CacheManager::SaveCache(std::string key,
 nlohmann::json GpgFrontend::CacheManager::LoadCache(std::string key) {
   auto data_object_key = get_data_object_key(key);
 
-  SPDLOG_DEBUG("load cache, data object key: {}", data_object_key);
   if (!cache_storage_.exists(key)) {
     cache_storage_.insert(key, load_cache_storage(key, {}));
   }
diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp
index a8e685e0..ee6d2b09 100644
--- a/src/core/function/gpg/GpgKeyGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGetter.cpp
@@ -78,12 +78,9 @@ GpgFrontend::KeyLinkListPtr GpgFrontend::GpgKeyGetter::FetchKey() {
   // get the lock
   std::lock_guard<std::mutex> lock(keys_cache_mutex_);
 
-  SPDLOG_DEBUG("channel id: {}", GetChannel());
-
   auto keys_list = std::make_unique<GpgKeyLinkList>();
 
   for (const auto& [key, value] : keys_cache_) {
-    SPDLOG_DEBUG("fetch key id: {}", value.GetId());
     keys_list->push_back(value.Copy());
   }
   return keys_list;
@@ -118,8 +115,6 @@ void GpgFrontend::GpgKeyGetter::FlushKeyCache() {
         gpg_key = GetKey(gpg_key.GetId(), false);
       }
 
-      SPDLOG_DEBUG("load key fpr: {} id: {}", gpg_key.GetFingerprint(),
-                   gpg_key.GetId());
       keys_cache_.insert({gpg_key.GetId(), std::move(gpg_key)});
     }
   }
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 0d715ba7..d5919cff 100644
--- a/src/core/function/gpg/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -103,7 +103,48 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire(
  * @return the process doing this job
  */
 void GpgFrontend::GpgKeyOpera::GenerateRevokeCert(
-    const GpgKey& key, const std::string& output_file_name) {}
+    const GpgKey& key, const std::string& output_file_path) {
+  // get all components
+  GpgCommandExecutor::GetInstance().Execute(
+      ctx_.GetInfo().AppPath,
+      {"--command-fd", "0", "--status-fd", "1", "--no-tty", "-o",
+       output_file_path, "--gen-revoke", key.GetFingerprint().c_str()},
+      [=](int exit_code, const std::string& p_out, const std::string& p_err) {
+        if (exit_code != 0) {
+          SPDLOG_ERROR(
+              "gnupg gen revoke execute error, process stderr: {}, process "
+              "stdout: {}",
+              p_err, p_out);
+        } else {
+          SPDLOG_DEBUG(
+              "gnupg gen revoke exit_code: {}, process stdout size: {}",
+              exit_code, p_out.size());
+        }
+      },
+      [](QProcess* proc) -> void {
+        // Code From Gpg4Win
+        while (proc->canReadLine()) {
+          const QString line = QString::fromUtf8(proc->readLine()).trimmed();
+          SPDLOG_DEBUG("line: {}", line.toStdString());
+          if (line == QLatin1String("[GNUPG:] GET_BOOL gen_revoke.okay")) {
+            proc->write("y\n");
+          } else if (line == QLatin1String("[GNUPG:] GET_LINE "
+                                           "ask_revocation_reason.code")) {
+            proc->write("0\n");
+          } else if (line == QLatin1String("[GNUPG:] GET_LINE "
+                                           "ask_revocation_reason.text")) {
+            proc->write("\n");
+          } else if (line == QLatin1String(
+                                 "[GNUPG:] GET_BOOL openfile.overwrite.okay")) {
+            // We asked before
+            proc->write("y\n");
+          } else if (line == QLatin1String("[GNUPG:] GET_BOOL "
+                                           "ask_revocation_reason.okay")) {
+            proc->write("y\n");
+          }
+        }
+      });
+}
 
 /**
  * Generate a new key pair
diff --git a/src/core/function/gpg/GpgKeyOpera.h b/src/core/function/gpg/GpgKeyOpera.h
index 703eb824..5446bd66 100644
--- a/src/core/function/gpg/GpgKeyOpera.h
+++ b/src/core/function/gpg/GpgKeyOpera.h
@@ -86,8 +86,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyOpera
    * @param key
    * @param output_file_name
    */
-  static void GenerateRevokeCert(const GpgKey& key,
-                                 const std::string& output_file_name);
+  void GenerateRevokeCert(const GpgKey& key,
+                          const std::string& output_file_name);
 
   /**
    * @brief
diff --git a/src/ui/dialog/GeneralDialog.cpp b/src/ui/dialog/GeneralDialog.cpp
index 90c56b8a..d4b6613e 100644
--- a/src/ui/dialog/GeneralDialog.cpp
+++ b/src/ui/dialog/GeneralDialog.cpp
@@ -39,37 +39,40 @@ GpgFrontend::UI::GeneralDialog::~GeneralDialog() = default;
 
 void GpgFrontend::UI::GeneralDialog::slot_restore_settings() noexcept {
   try {
-    SettingsObject general_windows_state(name_ + "_dialog_state");
+    update_rect_cache();
 
-    bool window_save = general_windows_state.Check("window_save", true);
+    SettingsObject general_windows_state(name_ + "_dialog_state");
+    bool window_save = general_windows_state.Check("window_save", false);
 
     // Restore window size & location
     if (window_save) {
-      int x = general_windows_state.Check("window_pos").Check("x", 100),
-          y = general_windows_state.Check("window_pos").Check("y", 100);
+      int x = general_windows_state.Check("window_pos").Check("x", 0),
+          y = general_windows_state.Check("window_pos").Check("y", 0);
+      SPDLOG_DEBUG("stored dialog pos, x: {}, y: {}", x, y);
 
-      pos_ = {x, y};
+      QPoint relative_pos = {x, y};
+      QPoint pos = parent_rect_.topLeft() + relative_pos;
+      SPDLOG_DEBUG("relative dialog pos, x: {}, y: {}", relative_pos.x(),
+                   relative_pos.y());
 
-      int width =
-              general_windows_state.Check("window_size").Check("width", 400),
+      int width = general_windows_state.Check("window_size").Check("width", 0),
           height =
-              general_windows_state.Check("window_size").Check("height", 247);
+              general_windows_state.Check("window_size").Check("height", 0);
+      SPDLOG_DEBUG("stored dialog size, width: {}, height: {}", width, height);
 
-      size_ = {width, height};
+      QRect target_rect_ = {pos.x(), pos.y(), width, height};
+      SPDLOG_DEBUG("dialog stored target rect, width: {}, height: {}", width,
+                   height);
 
       // check for valid
-      if (!pos_.isNull() && pos_.x() > 50 && pos_.y() > 50 && size_.isValid()) {
-        this->move(pos_);
-        this->resize(size_);
-        return;
+      if (width > 0 && height > 0 && screen_rect_.contains(target_rect_)) {
+        this->setGeometry(target_rect_);
+        this->rect_restored_ = true;
       }
     }
 
-    // default action
-    movePosition2CenterOfParent();
-
   } catch (...) {
-    SPDLOG_ERROR(name_, "error");
+    SPDLOG_ERROR("error at restoring settings");
   }
 }
 
@@ -77,15 +80,22 @@ void GpgFrontend::UI::GeneralDialog::slot_save_settings() noexcept {
   try {
     SettingsObject general_windows_state(name_ + "_dialog_state");
 
-    // window position and size
-    general_windows_state["window_pos"]["x"] = pos().x();
-    general_windows_state["window_pos"]["y"] = pos().y();
+    update_rect_cache();
+
+    SPDLOG_DEBUG("dialog pos, x: {}, y: {}", rect_.x(), rect_.y());
+    SPDLOG_DEBUG("dialog size, width: {}, height: {}", rect_.width(),
+                 rect_.height());
+
+    // window position relative to parent
+    auto relative_pos = rect_.topLeft() - parent_rect_.topLeft();
+    SPDLOG_DEBUG("store dialog pos, x: {}, y: {}", relative_pos.x(),
+                 relative_pos.y());
 
-    // update size of current dialog
-    size_ = this->size();
+    general_windows_state["window_pos"]["x"] = relative_pos.x();
+    general_windows_state["window_pos"]["y"] = relative_pos.y();
 
-    general_windows_state["window_size"]["width"] = size_.width();
-    general_windows_state["window_size"]["height"] = size_.height();
+    general_windows_state["window_size"]["width"] = rect_.width();
+    general_windows_state["window_size"]["height"] = rect_.height();
     general_windows_state["window_save"] = true;
 
   } catch (...) {
@@ -94,17 +104,17 @@ void GpgFrontend::UI::GeneralDialog::slot_save_settings() noexcept {
 }
 
 void GpgFrontend::UI::GeneralDialog::setPosCenterOfScreen() {
-  auto *screen = QGuiApplication::primaryScreen();
-  QRect geo = screen->availableGeometry();
-  int screen_width = geo.width();
-  int screen_height = geo.height();
+  update_rect_cache();
 
-  SPDLOG_DEBUG("primary screen available geometry", screen_width,
+  int screen_width = screen_rect_.width();
+  int screen_height = screen_rect_.height();
+  SPDLOG_DEBUG("dialog current screen available geometry", screen_width,
                screen_height);
 
-  pos_ = QPoint((screen_width - QWidget::width()) / 2,
-                (screen_height - QWidget::height()) / 2);
-  this->move(pos_);
+  // update rect of current dialog
+  rect_ = this->geometry();
+  this->move(screen_rect_.center() -
+             QPoint(rect_.width() / 2, rect_.height() / 2));
 }
 
 /**
@@ -112,71 +122,87 @@ void GpgFrontend::UI::GeneralDialog::setPosCenterOfScreen() {
  *
  */
 void GpgFrontend::UI::GeneralDialog::movePosition2CenterOfParent() {
-  // read pos and size from parent
-  if (this->parent() != nullptr) {
-    QPoint parent_pos = {0, 0};
-    QSize parent_size = {0, 0};
-
-    auto *parent_widget = qobject_cast<QWidget *>(this->parent());
-    if (parent_widget != nullptr) {
-      parent_pos = parent_widget->pos();
-      parent_size = parent_widget->size();
-    }
-
-    auto *parent_dialog = qobject_cast<QDialog *>(this->parent());
-    if (parent_dialog != nullptr) {
-      parent_pos = parent_dialog->pos();
-      parent_size = parent_dialog->size();
-    }
-
-    auto *parent_window = qobject_cast<QMainWindow *>(this->parent());
-    if (parent_window != nullptr) {
-      parent_pos = parent_window->pos();
-      parent_size = parent_window->size();
-    }
-
-    SPDLOG_DEBUG("parent pos x: {} y: {}", parent_pos.x(), parent_pos.y());
+  // update cache
+  update_rect_cache();
 
-    SPDLOG_DEBUG("parent size width: {} height: {}", parent_size.width(),
-                 parent_size.height());
+  // log for debug
+  SPDLOG_DEBUG("parent pos x: {} y: {}", parent_rect_.x(), parent_rect_.y());
+  SPDLOG_DEBUG("parent size width: {}, height: {}", parent_rect_.width(),
+               parent_rect_.height());
+  SPDLOG_DEBUG("parent center pos x: {}, y: {}", parent_rect_.center().x(),
+               parent_rect_.center().y());
+  SPDLOG_DEBUG("dialog pos x: {} y: {}", rect_.x(), rect_.y());
+  SPDLOG_DEBUG("dialog size width: {} height: {}", rect_.width(),
+               rect_.height());
+
+  if (parent_rect_.topLeft() != QPoint{0, 0} &&
+      parent_rect_.size() != QSize{0, 0}) {
+    if (rect_.width() <= 0) rect_.setWidth(100);
+    if (rect_.height() <= 0) rect_.setHeight(100);
+
+    QPoint target_position =
+        parent_rect_.center() - QPoint(rect_.width() / 2, rect_.height() / 2);
+
+    SPDLOG_DEBUG("update position to parent's center, target pos, x:{}, y: {}",
+                 target_position.x(), target_position.y());
+
+    this->move(target_position);
+  } else {
+    setPosCenterOfScreen();
+  }
+}
 
-    SPDLOG_DEBUG("this dialog size width: {} height: {}", size_.width(),
-                 size_.height());
+/**
+ *
+ */
+void GpgFrontend::UI::GeneralDialog::update_rect_cache() {
+  // update size of current dialog
+  rect_ = this->geometry();
 
-    if (parent_pos != QPoint{0, 0}) {
-      QPoint parent_center{parent_pos.x() + parent_size.width() / 2,
-                           parent_pos.y() + parent_size.height() / 2};
+  auto *screen = this->window()->screen();
+  screen_rect_ = screen->availableGeometry();
 
-      pos_ = {parent_center.x() - size_.width() / 2,
-              parent_center.y() - size_.height() / 2};
+  // read pos and size from parent
+  if (this->parent() != nullptr) {
+    QRect parent_rect;
 
-      // record parent_pos_
-      this->parent_pos_ = parent_pos;
-      this->parent_size_ = parent_size;
+    auto *parent_widget = qobject_cast<QWidget *>(this->parent());
+    if (parent_widget != nullptr) {
+      parent_rect = parent_widget->geometry();
+    } else {
+      auto *parent_dialog = qobject_cast<QDialog *>(this->parent());
+      if (parent_dialog != nullptr) {
+        parent_rect = parent_dialog->geometry();
+      } else {
+        auto *parent_window = qobject_cast<QMainWindow *>(this->parent());
+        if (parent_window != nullptr) {
+          parent_rect = parent_window->geometry();
+        }
+      }
     }
+    parent_rect_ = parent_rect;
   } else {
     // reset parent's pos and size
-    this->parent_pos_ = QPoint{0, 0};
-    this->parent_size_ = QSize{0, 0};
+    this->parent_rect_ = QRect{0, 0, 0, 0};
   }
+}
 
-  // log for debug
-  SPDLOG_DEBUG("parent pos x: {} y: {}", parent_pos_.x(), parent_pos_.y());
-  SPDLOG_DEBUG("parent size width: {}", parent_size_.width(),
-               "height:", parent_size_.height());
+/**
+ * @brief
+ *
+ */
+bool GpgFrontend::UI::GeneralDialog::isRectRestored() { return rect_restored_; }
 
-  if (parent_pos_ != QPoint{0, 0} && parent_size_ != QSize{0, 0}) {
-    SPDLOG_DEBUG("update current dialog position now");
-    QPoint parent_center{parent_pos_.x() + parent_size_.width() / 2,
-                         parent_pos_.y() + parent_size_.height() / 2};
+/**
+ * @brief
+ *
+ */
+void GpgFrontend::UI::GeneralDialog::showEvent(QShowEvent *event) {
+  SPDLOG_DEBUG("General Dialog named {} is about to show, caught show event",
+               name_);
 
-    // update size of current dialog
-    size_ = this->size();
+  // default position strategy
+  if (!isRectRestored()) movePosition2CenterOfParent();
 
-    pos_ = {parent_center.x() - size_.width() / 2,
-            parent_center.y() - size_.height() / 2};
-    this->move(pos_);
-  } else {
-    setPosCenterOfScreen();
-  }
+  QWidget::showEvent(event);
 }
\ No newline at end of file
diff --git a/src/ui/dialog/GeneralDialog.h b/src/ui/dialog/GeneralDialog.h
index 41018105..dc42fb6b 100644
--- a/src/ui/dialog/GeneralDialog.h
+++ b/src/ui/dialog/GeneralDialog.h
@@ -57,6 +57,18 @@ class GeneralDialog : public QDialog {
    */
   void movePosition2CenterOfParent();
 
+  /**
+   * @brief
+   *
+   */
+  [[nodiscard]] bool isRectRestored();
+
+  /**
+   * @brief
+   *
+   */
+  void showEvent(QShowEvent* event) override;
+
  private slots:
   /**
    *
@@ -69,11 +81,16 @@ class GeneralDialog : public QDialog {
   void slot_save_settings() noexcept;
 
  private:
+  /**
+   *
+   */
+  void update_rect_cache();
+
   std::string name_;  ///<
-  QPoint pos_;        ///<
-  QSize size_;        ///<
-  QPoint parent_pos_;
-  QSize parent_size_;
+  QRect rect_;
+  QRect parent_rect_;
+  QRect screen_rect_;
+  bool rect_restored_ = false;
 };
 }  // namespace GpgFrontend::UI
 
diff --git a/src/ui/dialog/WaitingDialog.cpp b/src/ui/dialog/WaitingDialog.cpp
index afdd55b8..b0888581 100644
--- a/src/ui/dialog/WaitingDialog.cpp
+++ b/src/ui/dialog/WaitingDialog.cpp
@@ -28,10 +28,12 @@
 
 #include "WaitingDialog.h"
 
+#include "dialog/GeneralDialog.h"
+
 namespace GpgFrontend::UI {
 
 WaitingDialog::WaitingDialog(const QString& title, QWidget* parent)
-    : QDialog(parent) {
+    : GeneralDialog("WaitingDialog", parent) {
   auto* pb = new QProgressBar();
   pb->setRange(0, 0);
   pb->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
@@ -51,26 +53,6 @@ WaitingDialog::WaitingDialog(const QString& title, QWidget* parent)
   this->setAttribute(Qt::WA_DeleteOnClose);
   this->setFixedSize(240, 42);
 
-  if (parentWidget() == nullptr) {
-    auto* screen = QGuiApplication::primaryScreen();
-    QRect geo = screen->availableGeometry();
-    int screen_width = geo.width();
-    int screen_height = geo.height();
-
-    SPDLOG_DEBUG("primary screen available geometry: {} {}", screen_width,
-                 screen_height);
-
-    auto pos = QPoint((screen_width - QWidget::width()) / 2,
-                      (screen_height - QWidget::height()) / 2);
-    this->move(pos);
-
-  } else {
-    auto pos = QPoint(parent->x() + (parent->width() - QWidget::width()) / 2,
-                      parent->y() + (parent->height() - QWidget::height()) / 2);
-    SPDLOG_DEBUG("pos: {} {}", pos.x(), pos.y());
-    this->move(pos);
-  }
-
   this->show();
 }
 
diff --git a/src/ui/dialog/WaitingDialog.h b/src/ui/dialog/WaitingDialog.h
index 1bb6a22b..c8193cba 100644
--- a/src/ui/dialog/WaitingDialog.h
+++ b/src/ui/dialog/WaitingDialog.h
@@ -30,6 +30,7 @@
 #define __UI_WAITING_DIALOG_H__
 
 #include "ui/GpgFrontendUI.h"
+#include "ui/dialog/GeneralDialog.h"
 
 namespace GpgFrontend::UI {
 
@@ -37,7 +38,7 @@ namespace GpgFrontend::UI {
  * @brief
  *
  */
-class WaitingDialog : public QDialog {
+class WaitingDialog : public GeneralDialog {
   Q_OBJECT
  public:
   /**
diff --git a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
index 312cd946..b58d09c1 100644
--- a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
+++ b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
@@ -53,6 +53,10 @@ GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog(
     auto file_name = QFileDialog::getSaveFileName(
         this, _("Export Key Package"), ui_->nameValueLabel->text() + ".gfepack",
         QString(_("Key Package")) + " (*.gfepack);;All Files (*)");
+
+    // check path
+    if (file_name.isEmpty()) return;
+
     ui_->outputPathLabel->setText(file_name);
   });
 
@@ -62,6 +66,9 @@ GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog(
         ui_->nameValueLabel->text() + ".key",
         QString(_("Key File")) + " (*.key);;All Files (*)");
 
+    // check path
+    if (file_name.isEmpty()) return;
+
     if (!KeyPackageOperator::GeneratePassphrase(file_name.toStdString(),
                                                 passphrase_)) {
       QMessageBox::critical(
diff --git a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
index ed578aa7..9ac60a73 100644
--- a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
@@ -56,11 +56,6 @@ KeyDetailsDialog::KeyDetailsDialog(const GpgKey& key, QWidget* parent)
   this->setWindowTitle(_("Key Details"));
   this->setModal(true);
 
-  // this->setMinimumSize({520, 600});
-
-  // move to center of the parent
-  this->movePosition2CenterOfParent();
-
   this->show();
 }
 }  // namespace GpgFrontend::UI
diff --git a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
index 13c857a0..c5d0670a 100644
--- a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
@@ -333,34 +333,10 @@ void KeyPairOperaTab::slot_gen_revoke_cert() {
 
   if (dialog.exec()) m_output_file_name = dialog.selectedFiles().front();
 
-  if (!m_output_file_name.isEmpty())
-    CommonUtils::GetInstance()->SlotExecuteGpgCommand(
-        {"--command-fd", "0", "--status-fd", "1", "--no-tty", "-o",
-         m_output_file_name, "--gen-revoke", m_key_.GetFingerprint().c_str()},
-        [](QProcess* proc) -> void {
-          // Code From Gpg4Win
-          while (proc->canReadLine()) {
-            const QString line = QString::fromUtf8(proc->readLine()).trimmed();
-            SPDLOG_DEBUG("line: {}", line.toStdString());
-            if (line == QLatin1String("[GNUPG:] GET_BOOL gen_revoke.okay")) {
-              proc->write("y\n");
-            } else if (line == QLatin1String("[GNUPG:] GET_LINE "
-                                             "ask_revocation_reason.code")) {
-              proc->write("0\n");
-            } else if (line == QLatin1String("[GNUPG:] GET_LINE "
-                                             "ask_revocation_reason.text")) {
-              proc->write("\n");
-            } else if (line ==
-                       QLatin1String(
-                           "[GNUPG:] GET_BOOL openfile.overwrite.okay")) {
-              // We asked before
-              proc->write("y\n");
-            } else if (line == QLatin1String("[GNUPG:] GET_BOOL "
-                                             "ask_revocation_reason.okay")) {
-              proc->write("y\n");
-            }
-          }
-        });
+  if (!m_output_file_name.isEmpty()) {
+    GpgKeyOpera::GetInstance().GenerateRevokeCert(
+        m_key_, m_output_file_name.toStdString());
+  }
 }
 
 void KeyPairOperaTab::slot_modify_password() {
diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index e411e036..ce3c1c3d 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -561,7 +561,6 @@ KeyIdArgsListPtr& KeyTable::GetChecked() {
   auto& ret = checked_key_ids_;
   for (int i = 0; i < buffered_keys_.size(); i++) {
     auto key_id = buffered_keys_[i].GetId();
-    SPDLOG_DEBUG("i: {} key_id: {}", i, key_id);
     if (key_list_->item(i, 0)->checkState() == Qt::Checked &&
         std::find(ret->begin(), ret->end(), key_id) == ret->end()) {
       ret->push_back(key_id);
@@ -592,7 +591,6 @@ void KeyTable::Refresh(KeyLinkListPtr m_keys) {
   int row_count = 0;
 
   while (it != keys->end()) {
-    SPDLOG_DEBUG("filtering key id: {}", it->GetId());
     // filter by search bar's keyword
     if (ability_ & KeyMenuAbility::SEARCH_BAR && !keyword_.empty()) {
       auto name = it->GetName();
@@ -621,7 +619,7 @@ void KeyTable::Refresh(KeyLinkListPtr m_keys) {
         continue;
       }
     }
-    SPDLOG_DEBUG("adding key id: {}", it->GetId());
+
     if (select_type_ == KeyListRow::ONLY_SECRET_KEY && !it->IsPrivateKey()) {
       it = keys->erase(it);
       continue;
@@ -704,9 +702,6 @@ void KeyTable::Refresh(KeyLinkListPtr m_keys) {
       tmp3->setFont(strike);
     }
 
-    SPDLOG_DEBUG("key id: {} added into key_list_: {}", it->GetId(),
-                 static_cast<void*>(this));
-
     // move to buffered keys
     buffered_keys_.emplace_back(std::move(*it));