diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index f55dc310e..9d7b8df32 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -68,7 +68,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig) m_coreProcess(appConfig, m_serverConfig), m_serverConnection(this, appConfig, m_serverConfig, m_serverConfigDialogState), m_clientConnection(this, appConfig), - m_tlsUtility(appConfig), + m_tlsUtility(this), m_trayIcon{new QSystemTrayIcon(this)}, m_guiDupeChecker{new QLocalServer(this)}, m_daemonIpcClient{new ipc::DaemonIpcClient(this)}, diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp index 040cd3c6b..895150139 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp @@ -29,7 +29,7 @@ SettingsDialog::SettingsDialog( m_appConfig(appConfig), m_serverConfig(serverConfig), m_coreProcess(coreProcess), - m_tlsUtility(appConfig) + m_tlsUtility(this) { ui->setupUi(this); diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 8b44f51d3..f04d0fb3a 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -280,18 +280,11 @@ private: bool m_LoadFromSystemScope = false; bool m_RequireClientCert = true; - /** - * @brief Flag is set when any TLS is setting is changed, and is reset - * when the TLS changed event is emitted. - */ - bool m_TlsChanged = false; - deskflow::gui::IConfigScopes &m_Scopes; std::shared_ptr m_pDeps; QString m_ScreenName; signals: - void tlsChanged(); void screenNameChanged(); void logLevelChanged(); }; diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index d45d5bf7a..b04c571c3 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -556,7 +556,7 @@ bool CoreProcess::addServerArgs(QStringList &args, QString &app) // since it's not clear why (it is only needed for the server), this has now // been moved to server args. if (Settings::value(Settings::Security::TlsEnabled).toBool()) { - TlsUtility tlsUtility(m_appConfig); + TlsUtility tlsUtility(this); if (!tlsUtility.persistCertificate()) { qCritical("failed to persist tls certificate"); return false; diff --git a/src/lib/gui/tls/TlsUtility.cpp b/src/lib/gui/tls/TlsUtility.cpp index 61553d95f..afc82c7ed 100644 --- a/src/lib/gui/tls/TlsUtility.cpp +++ b/src/lib/gui/tls/TlsUtility.cpp @@ -13,7 +13,7 @@ namespace deskflow::gui { -TlsUtility::TlsUtility(const IAppConfig &appConfig) : m_appConfig(appConfig) +TlsUtility::TlsUtility(QObject *parent) : QObject(parent) { } diff --git a/src/lib/gui/tls/TlsUtility.h b/src/lib/gui/tls/TlsUtility.h index ba3cc1dc5..340743381 100644 --- a/src/lib/gui/tls/TlsUtility.h +++ b/src/lib/gui/tls/TlsUtility.h @@ -6,8 +6,6 @@ #pragma once -#include "gui/config/IAppConfig.h" - #include "TlsCertificate.h" #include @@ -19,7 +17,7 @@ class TlsUtility : public QObject Q_OBJECT public: - explicit TlsUtility(const IAppConfig &appConfig); + explicit TlsUtility(QObject *parent = nullptr); bool generateCertificate(); bool persistCertificate(); @@ -34,7 +32,6 @@ public: bool isEnabled() const; private: - const IAppConfig &m_appConfig; TlsCertificate m_certificate; };