From c811b06d6b92dae1b23cc2dd3e81c25428c419ba Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 4 Sep 2023 20:34:38 +0200
Subject: [PATCH] Configure HTTPS certificate via wizard

---
 syncthingwidgets/settings/settings.cpp       | 1 +
 syncthingwidgets/settings/setupdetection.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/syncthingwidgets/settings/settings.cpp b/syncthingwidgets/settings/settings.cpp
index 03c1939..26761fb 100644
--- a/syncthingwidgets/settings/settings.cpp
+++ b/syncthingwidgets/settings/settings.cpp
@@ -665,6 +665,7 @@ void Connection::addConfigFromWizard(const Data::SyncthingConfig &config)
     primary.password.clear();
     primary.apiKey = apiKey;
     primary.autoConnect = true; // ensure the connection is actually established when applying
+    primary.httpsCertPath = Data::SyncthingConfig::locateHttpsCertificate();
 }
 
 } // namespace Settings
diff --git a/syncthingwidgets/settings/setupdetection.cpp b/syncthingwidgets/settings/setupdetection.cpp
index 305e823..79e4df2 100644
--- a/syncthingwidgets/settings/setupdetection.cpp
+++ b/syncthingwidgets/settings/setupdetection.cpp
@@ -64,8 +64,12 @@ void SetupDetection::restoreConfig()
 
 void SetupDetection::initConnection()
 {
-    connection.setSyncthingUrl(config.syncthingUrl());
-    connection.setApiKey(config.guiApiKey.toLocal8Bit());
+    auto settings = Data::SyncthingConnectionSettings();
+    settings.syncthingUrl = config.syncthingUrl();
+    settings.apiKey = config.guiApiKey.toLocal8Bit();
+    settings.httpsCertPath = certPath;
+    settings.loadHttpsCert();
+    connection.applySettings(settings);
 }
 
 bool SetupDetection::hasConfig() const