From be4b8066c3cca9542217c1a012accdf9d80803f2 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Sun, 30 Apr 2023 18:22:43 +0800 Subject: [PATCH] Add static discoveredLegacyConfigPath member to configfile Signed-off-by: Claudio Cambra --- src/libsync/configfile.cpp | 18 +++++++++++++++++- src/libsync/configfile.h | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 568294669..84803dcfc 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -114,7 +114,8 @@ namespace chrono = std::chrono; Q_LOGGING_CATEGORY(lcConfigFile, "nextcloud.sync.configfile", QtInfoMsg) -QString ConfigFile::_confDir = QString(); +QString ConfigFile::_confDir = {}; +QString ConfigFile::_discoveredLegacyConfigPath = {}; static chrono::milliseconds millisecondsValue(const QSettings &setting, const char *key, chrono::milliseconds defaultValue) @@ -1155,4 +1156,19 @@ void ConfigFile::setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles) excludedFiles.addExcludeFilePath(userList); } } + +QString ConfigFile::discoveredLegacyConfigPath() +{ + return _discoveredLegacyConfigPath; +} + +void ConfigFile::setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath) +{ + if (_discoveredLegacyConfigPath == discoveredLegacyConfigPath) { + return; + } + + _discoveredLegacyConfigPath = discoveredLegacyConfigPath; +} + } diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index 2b2bf8baa..3fc7f5e4f 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -219,6 +219,10 @@ public: /// Add the system and user exclude file path to the ExcludedFiles instance. static void setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles); + /// Set during first time migration of legacy accounts in AccountManager + [[nodiscard]] static QString discoveredLegacyConfigPath(); + static void setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath); + protected: [[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const; void storeData(const QString &group, const QString &key, const QVariant &value); @@ -237,6 +241,7 @@ private: using SharedCreds = QSharedPointer; static QString _confDir; + static QString _discoveredLegacyConfigPath; }; } #endif // CONFIGFILE_H -- 2.30.2