mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ConfigFile().macFileProviderModuleEnabled() config flag

Browse Source 
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 <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-09-06 15:40:19 +08:00
parent 0c40ceff9c
commit 1db59fecc1
No known key found for this signature in database
GPG Key ID: C839200C384636B0
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/macOS/fileprovider_mac.mm
View File

@ -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) {

14
src/libsync/configfile.cpp
View File

@ -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);
}
}

3
src/libsync/configfile.h
View File

@ -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);