2 files changed, 77 insertions, 13 deletions
diff --git a/include/ui/keygen/SubkeyGenerateThread.h b/include/server/api/PubkeyGetter.h
index b442acea..9d3bdb60 100644
--- a/include/ui/keygen/SubkeyGenerateThread.h
+++ b/include/server/api/PubkeyGetter.h
@@ -18,34 +18,40 @@
  * Their source code version also complies with GNU General Public License.
  *
  * The source code version of this software was modified and released
- * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021.
+ * by Saturneric<[email protected]> starting on May 12, 2021.
  *
  */
 
-#ifndef GPGFRONTEND_SUBKEYGENERATETHREAD_H
-#define GPGFRONTEND_SUBKEYGENERATETHREAD_H
+#ifndef GPGFRONTEND_ZH_CN_TS_PUBKEYGETTER_H
+#define GPGFRONTEND_ZH_CN_TS_PUBKEYGETTER_H
 
+#include "GpgFrontend.h"
+#include "server/BaseAPI.h"
 #include "gpg/GpgContext.h"
 
-class SubkeyGenerateThread : public QThread {
-    Q_OBJECT
+class ComUtils;
 
+/**
+ * Get and Import Pubkey from server
+ */
+class PubkeyGetter : public BaseAPI {
 public:
-    SubkeyGenerateThread(GpgKey key, GenKeyInfo *keyGenParams, GpgME::GpgContext *ctx);
 
-signals:
-
-    void signalKeyGenerated(bool success);
+    PubkeyGetter(GpgME::GpgContext *ctx, const QVector<QString> &fprs);
 
 private:
-    const GpgKey mKey;
-    GenKeyInfo *keyGenParams;
+
     GpgME::GpgContext *mCtx;
 
+    const QVector<QString> &mFprs;
+
 protected:
 
-    void run() override;
+    void construct_json() final;
+
+    void deal_reply() final;
+
 };
 
 
-#endif //GPGFRONTEND_SUBKEYGENERATETHREAD_H
+#endif //GPGFRONTEND_ZH_CN_TS_PUBKEYGETTER_H
diff --git a/include/server/api/PubkeyUploader.h b/include/server/api/PubkeyUploader.h
new file mode 100644
index 00000000..7521cdd3
--- /dev/null
+++ b/include/server/api/PubkeyUploader.h
@@ -0,0 +1,58 @@
+/**
+ * This file is part of GPGFrontend.
+ *
+ * GPGFrontend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Foobar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The initial version of the source code is inherited from gpg4usb-team.
+ * Their source code version also complies with GNU General Public License.
+ *
+ * The source code version of this software was modified and released
+ * by Saturneric<[email protected]> starting on May 12, 2021.
+ *
+ */
+
+#ifndef GPGFRONTEND_ZH_CN_TS_PUBKEYUPLOADER_H
+#define GPGFRONTEND_ZH_CN_TS_PUBKEYUPLOADER_H
+
+#include "GpgFrontend.h"
+#include "server/BaseAPI.h"
+#include "gpg/GpgContext.h"
+
+#include "rapidjson/document.h"
+
+/**
+ * Upload pubkey into server
+ */
+class PubkeyUploader : public BaseAPI {
+public:
+
+    PubkeyUploader(GpgME::GpgContext *ctx, const QVector<GpgKey> &keys);
+
+private:
+
+    const QVector<GpgKey> &mKeys;
+
+    GpgME::GpgContext *mCtx;
+
+protected:
+
+    void construct_json() final;
+
+    void deal_reply() final;
+
+
+};
+
+
+#endif //GPGFRONTEND_ZH_CN_TS_PUBKEYUPLOADER_H