2 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
index 58734c7d..662ac77a 100644
--- a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <cassert>
 #include <cstddef>
+#include <utility>
 
-#include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyOpera.h"
 #include "core/utils/GpgUtils.h"
 #include "ui/UISignalStation.h"
@@ -44,17 +44,16 @@
 
 namespace GpgFrontend::UI {
 
-SubkeyGenerateDialog::SubkeyGenerateDialog(int channel, const KeyId& key_id,
+SubkeyGenerateDialog::SubkeyGenerateDialog(int channel, GpgKeyPtr key,
                                            QWidget* parent)
     : GeneralDialog(typeid(SubkeyGenerateDialog).name(), parent),
       ui_(QSharedPointer<Ui_SubkeyGenDialog>::create()),
       current_gpg_context_channel_(channel),
-      key_(GpgKeyGetter::GetInstance(current_gpg_context_channel_)
-               .GetKey(key_id)),
+      key_(std::move(key)),
       gen_subkey_info_(QSharedPointer<KeyGenerateInfo>::create(true)),
       supported_subkey_algos_(KeyGenerateInfo::GetSupportedSubkeyAlgo()) {
   ui_->setupUi(this);
-  assert(key_.IsGood());
+  assert(key_ != nullptr);
 
   ui_->algoLabel->setText(tr("Algorithm"));
   ui_->keyLengthLabel->setText(tr("Key Length"));
diff --git a/src/ui/dialog/key_generate/SubkeyGenerateDialog.h b/src/ui/dialog/key_generate/SubkeyGenerateDialog.h
index 96dee49e..683c3b66 100644
--- a/src/ui/dialog/key_generate/SubkeyGenerateDialog.h
+++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.h
@@ -53,8 +53,7 @@ class SubkeyGenerateDialog : public GeneralDialog {
    * @param key_id
    * @param parent
    */
-  explicit SubkeyGenerateDialog(int channel, const KeyId& key_id,
-                                QWidget* parent);
+  explicit SubkeyGenerateDialog(int channel, GpgKeyPtr key, QWidget* parent);
 
  private slots:
 
@@ -68,7 +67,7 @@ class SubkeyGenerateDialog : public GeneralDialog {
   QSharedPointer<Ui_SubkeyGenDialog> ui_;  ///<
   int current_gpg_context_channel_;        ///<
 
-  GpgKey key_;                                       ///<
+  GpgKeyPtr key_;                                    ///<
   QSharedPointer<KeyGenerateInfo> gen_subkey_info_;  ///<
   QContainer<KeyAlgo> supported_subkey_algos_;       ///<