From 6990477504e03d85999d52bae595d0e3dd489137 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 13 Mar 2025 22:51:02 -0400 Subject: [PATCH] refactor: remove coretool use from tlsCertificate --- src/lib/gui/tls/TlsCertificate.cpp | 11 +++-------- src/lib/gui/tls/TlsCertificate.h | 3 --- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index 56aa238c0..7e2720053 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -8,8 +8,7 @@ #include "TlsCertificate.h" #include "base/finally.h" -#include "common/constants.h" -#include "gui/core/CoreTool.h" +#include "common/Settings.h" #include "net/FingerprintData.h" #include "net/FingerprintDatabase.h" #include "net/SecureUtils.h" @@ -25,10 +24,6 @@ TlsCertificate::TlsCertificate(QObject *parent) : QObject(parent) { - CoreTool coreTool; - m_profileDir = coreTool.getProfileDir(); - if (m_profileDir.isEmpty()) - qCritical() << "unable to get profile dir"; } bool TlsCertificate::generateCertificate(const QString &path, int keyLength) @@ -77,12 +72,12 @@ int TlsCertificate::getCertKeyLength(const QString &path) QString TlsCertificate::getCertificatePath() const { - return QStringLiteral("%1/%2/%3").arg(m_profileDir, kTlsDirName, kTlsCertificateFilename); + return QStringLiteral("%1/%2/%3").arg(Settings::settingsPath(), kTlsDirName, kTlsCertificateFilename); } QString TlsCertificate::getTlsDir() const { - return QStringLiteral("%1/%2").arg(m_profileDir, kTlsDirName); + return QStringLiteral("%1/%2").arg(Settings::settingsPath(), kTlsDirName); } bool TlsCertificate::isCertificateValid(const QString &path) diff --git a/src/lib/gui/tls/TlsCertificate.h b/src/lib/gui/tls/TlsCertificate.h index cf711457e..877b773fe 100644 --- a/src/lib/gui/tls/TlsCertificate.h +++ b/src/lib/gui/tls/TlsCertificate.h @@ -22,7 +22,4 @@ public: int getCertKeyLength(const QString &path); QString getCertificatePath() const; QString getTlsDir() const; - -private: - QString m_profileDir; };