aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui/thread
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-08-05 16:55:32 +0000
committersaturneric <[email protected]>2024-08-05 16:55:32 +0000
commit795a81bd1edad59ef51e73157b5ad68cfa30e328 (patch)
treefd9c4da2f1389f0a236d806e005cabb9f5ceab41 /src/ui/thread
parentfix: build pipeline (diff)
parentfix: unchecking some check boxes at gnupg controller will not restart (diff)
downloadGpgFrontend-2.1.4.tar.gz
GpgFrontend-2.1.4.zip
fix: according to issues and test, apply some fixesv2.1.4
Diffstat (limited to 'src/ui/thread')
-rw-r--r--src/ui/thread/KeyServerImportTask.cpp2
-rw-r--r--src/ui/thread/KeyServerSearchTask.cpp8
-rw-r--r--src/ui/thread/KeyServerSearchTask.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ui/thread/KeyServerImportTask.cpp b/src/ui/thread/KeyServerImportTask.cpp
index 0abeb944..4a1b0e13 100644
--- a/src/ui/thread/KeyServerImportTask.cpp
+++ b/src/ui/thread/KeyServerImportTask.cpp
@@ -42,7 +42,7 @@ GpgFrontend::UI::KeyServerImportTask::KeyServerImportTask(
HoldOnLifeCycle(true);
if (keyserver_url_.isEmpty()) {
- KeyServerSO key_server(SettingsObject("general_settings_state"));
+ KeyServerSO key_server(SettingsObject("key_server"));
keyserver_url_ = key_server.GetTargetServer();
}
}
diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp
index 704899a4..2f7f08a7 100644
--- a/src/ui/thread/KeyServerSearchTask.cpp
+++ b/src/ui/thread/KeyServerSearchTask.cpp
@@ -61,6 +61,12 @@ void GpgFrontend::UI::KeyServerSearchTask::dealing_reply_from_server() {
if (network_reply == QNetworkReply::NoError) {
buffer = reply_->readAll();
}
- emit SignalKeyServerSearchResult(network_reply, buffer);
+
+ LOG_D() << "reply from key server:" << network_reply
+ << "err string:" << reply_->errorString()
+ << "reply:" << QString::fromLatin1(buffer);
+
+ emit SignalKeyServerSearchResult(network_reply, reply_->errorString(),
+ buffer);
emit SignalTaskShouldEnd(0);
}
diff --git a/src/ui/thread/KeyServerSearchTask.h b/src/ui/thread/KeyServerSearchTask.h
index d602e537..df247761 100644
--- a/src/ui/thread/KeyServerSearchTask.h
+++ b/src/ui/thread/KeyServerSearchTask.h
@@ -60,7 +60,7 @@ class KeyServerSearchTask : public Thread::Task {
* @param result
*/
void SignalKeyServerSearchResult(QNetworkReply::NetworkError reply,
- QByteArray buffer);
+ QString err_string, QByteArray buffer);
private slots: