diff options
| author | saturneric <[email protected]> | 2024-01-12 06:02:37 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-01-12 06:02:37 +0000 |
| commit | bf538056b24a68b8fd235b1c50991ee8eb46a776 (patch) | |
| tree | e1bab54095b80df62b321fb5bd69453f9f951b05 /src/ui/thread/KeyServerImportTask.cpp | |
| parent | feat: improve api and ui of keys import and export (diff) | |
| download | GpgFrontend-bf538056b24a68b8fd235b1c50991ee8eb46a776.tar.gz GpgFrontend-bf538056b24a68b8fd235b1c50991ee8eb46a776.zip | |
refactor: use QString instead of std::string and improve threading system
Diffstat (limited to 'src/ui/thread/KeyServerImportTask.cpp')
| -rw-r--r-- | src/ui/thread/KeyServerImportTask.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/thread/KeyServerImportTask.cpp b/src/ui/thread/KeyServerImportTask.cpp index e07473a8..4e8a41db 100644 --- a/src/ui/thread/KeyServerImportTask.cpp +++ b/src/ui/thread/KeyServerImportTask.cpp @@ -32,14 +32,14 @@ #include "ui/struct/SettingsObject.h" GpgFrontend::UI::KeyServerImportTask::KeyServerImportTask( - std::string keyserver_url, std::vector<std::string> keyids) + QString keyserver_url, std::vector<QString> keyids) : Task("key_server_import_task"), keyserver_url_(std::move(keyserver_url)), keyids_(std::move(keyids)), manager_(new QNetworkAccessManager(this)) { HoldOnLifeCycle(true); - if (keyserver_url_.empty()) { + if (keyserver_url_.isEmpty()) { try { SettingsObject key_server_json("key_server"); const auto key_server_list = @@ -53,7 +53,7 @@ GpgFrontend::UI::KeyServerImportTask::KeyServerImportTask( auto default_key_server = key_server_list[default_key_server_index].get<std::string>(); - keyserver_url_ = default_key_server; + keyserver_url_ = QString::fromStdString(default_key_server); } catch (...) { GF_UI_LOG_ERROR("setting operation error", "server_list", "default_server"); @@ -67,11 +67,10 @@ GpgFrontend::UI::KeyServerImportTask::KeyServerImportTask( } void GpgFrontend::UI::KeyServerImportTask::Run() { - QUrl const keyserver_url = QUrl(keyserver_url_.c_str()); + QUrl const keyserver_url = QUrl(keyserver_url_); for (const auto& key_id : keyids_) { QUrl const req_url(keyserver_url.scheme() + "://" + keyserver_url.host() + - "/pks/lookup?op=get&search=0x" + key_id.c_str() + - "&options=mr"); + "/pks/lookup?op=get&search=0x" + key_id + "&options=mr"); reply_ = manager_->get(QNetworkRequest(req_url)); connect(reply_, &QNetworkReply::finished, this, |