From 727d6ff16680bc990742705b0ea2cfcc3838b709 Mon Sep 17 00:00:00 2001
From: Luiz Sardinha <luizin@gmail.com>
Date: Mon, 23 Feb 2026 01:14:57 +0100
Subject: [PATCH] refactor: moving ServerApp::currentConfig to
 Settings::serverConfigFile

---
 src/lib/common/Settings.cpp    |  6 ++++++
 src/lib/common/Settings.h      |  1 +
 src/lib/deskflow/ServerApp.cpp | 11 ++---------
 src/lib/deskflow/ServerApp.h   |  1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp
index 742ba998c..536b7656e 100644
--- a/src/lib/common/Settings.cpp
+++ b/src/lib/common/Settings.cpp
@@ -233,6 +233,12 @@ QStringList Settings::validKeys()
   return Settings::m_validKeys;
 }
 
+QString Settings::serverConfigFile()
+{
+  bool useExt = value(Server::ExternalConfig).toBool();
+  return useExt ? value(Server::ExternalConfigFile).toString() : defaultValue(Server::ExternalConfigFile).toString();
+}
+
 bool Settings::isWritable()
 {
   return instance()->m_settings->isWritable();
diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h
index c0ecbc4a6..6506a1ce1 100644
--- a/src/lib/common/Settings.h
+++ b/src/lib/common/Settings.h
@@ -135,6 +135,7 @@ public:
   static bool isPortableMode();
   static QString settingsFile();
   static QString settingsPath();
+  static QString serverConfigFile();
   static QString tlsDir();
   static QString tlsTrustedServersDb();
   static QString tlsTrustedClientsDb();
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index 2e69adcd0..c85cb3cea 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -85,17 +85,10 @@ void ServerApp::reloadSignalHandler(Arch::ThreadSignal, void *)
   events->addEvent(Event(EventTypes::ServerAppReloadConfig, events->getSystemTarget()));
 }
 
-QString ServerApp::currentConfig() const
-{
-  bool useExt = Settings::value(Settings::Server::ExternalConfig).toBool();
-  return useExt ? Settings::value(Settings::Server::ExternalConfigFile).toString()
-                : Settings::defaultValue(Settings::Server::ExternalConfigFile).toString();
-}
-
 void ServerApp::reloadConfig()
 {
   LOG_DEBUG("reload configuration");
-  if (loadConfig(currentConfig())) {
+  if (loadConfig(Settings::serverConfigFile())) {
     if (m_server != nullptr) {
       m_server->setConfig(*m_config);
     }
@@ -105,7 +98,7 @@ void ServerApp::reloadConfig()
 
 void ServerApp::loadConfig()
 {
-  const auto path = currentConfig();
+  const auto path = Settings::serverConfigFile();
   if (path.isEmpty()) {
     LOG_CRIT("no configuration path provided");
     bye(s_exitConfig);
diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h
index 659f38162..99c45b84c 100644
--- a/src/lib/deskflow/ServerApp.h
+++ b/src/lib/deskflow/ServerApp.h
@@ -106,7 +106,6 @@ private:
   std::unique_ptr<ISocketFactory> getSocketFactory() const;
   NetworkAddress getAddress(const NetworkAddress &address) const;
 
-  QString currentConfig() const;
   bool m_suspended = false;
   Server *m_server = nullptr;
   ServerState m_serverState = ServerState::Uninitialized;