From 1db59fecc149f89fb307681f37c682a9ff79a2fc Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 6 Sep 2023 15:40:19 +0800 Subject: [PATCH] Remove ConfigFile().macFileProviderModuleEnabled() config flag Since we are going to distribute the file provider client as separate from the normal client, this flag doesn't make any practical sense. The user using the FileProvider desktop client will not want to not use the file provider module Signed-off-by: Claudio Cambra --- src/gui/macOS/fileprovider_mac.mm | 7 ------- src/libsync/configfile.cpp | 14 -------------- src/libsync/configfile.h | 3 --- 3 files changed, 24 deletions(-) diff --git a/src/gui/macOS/fileprovider_mac.mm b/src/gui/macOS/fileprovider_mac.mm index f45b915569..5303d9fa71 100644 --- a/src/gui/macOS/fileprovider_mac.mm +++ b/src/gui/macOS/fileprovider_mac.mm @@ -37,10 +37,6 @@ FileProvider::FileProvider(QObject * const parent) qCInfo(lcMacFileProvider) << "File provider system is not available on this version of macOS."; deleteLater(); return; - } else if (!ConfigFile().macFileProviderModuleEnabled()) { - qCInfo(lcMacFileProvider) << "File provider module is not enabled in application config."; - deleteLater(); - return; } qCInfo(lcMacFileProvider) << "Initialising file provider domain manager."; @@ -65,9 +61,6 @@ FileProvider *FileProvider::instance() if (!fileProviderAvailable()) { qCInfo(lcMacFileProvider) << "File provider system is not available on this version of macOS."; return nullptr; - } else if (!ConfigFile().macFileProviderModuleEnabled()) { - qCInfo(lcMacFileProvider) << "File provider module is not enabled in application config."; - return nullptr; } if (!_instance) { diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 7583956d8f..d46ad50f0e 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -111,8 +111,6 @@ static constexpr char certPath[] = "http_certificatePath"; static constexpr char certPasswd[] = "http_certificatePasswd"; static const QSet validUpdateChannels { QStringLiteral("stable"), QStringLiteral("beta") }; - -static constexpr auto macFileProviderModuleEnabledC = "macFileProviderModuleEnabled"; } namespace OCC { @@ -1229,16 +1227,4 @@ void ConfigFile::setDiscoveredLegacyConfigPath(const QString &discoveredLegacyCo _discoveredLegacyConfigPath = discoveredLegacyConfigPath; } -bool ConfigFile::macFileProviderModuleEnabled() const -{ - QSettings settings(configFile(), QSettings::IniFormat); - return settings.value(macFileProviderModuleEnabledC, false).toBool(); -} - -void ConfigFile::setMacFileProviderModuleEnabled(const bool moduleEnabled) -{ - QSettings settings(configFile(), QSettings::IniFormat); - settings.setValue(QLatin1String(macFileProviderModuleEnabledC), moduleEnabled); -} - } diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index 7ae1f98df2..97ec16e2f5 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -236,9 +236,6 @@ public: [[nodiscard]] static QString discoveredLegacyConfigPath(); static void setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath); - [[nodiscard]] bool macFileProviderModuleEnabled() const; - void setMacFileProviderModuleEnabled(const bool moduleEnabled); - protected: [[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const; void storeData(const QString &group, const QString &key, const QVariant &value);