Ensure folder whitelist and blacklist helper methods remove path from other lists
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Wed, 5 Jul 2023 18:38:49 +0000 (02:38 +0800)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Fri, 4 Aug 2023 09:40:41 +0000 (17:40 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/folder.cpp

index 205ab534fbc92e5b2a9fb0446d4fac0bb44fc2dd..d40017dec3098e5cf0c540bd2c4741655ca96f48 100644 (file)
@@ -871,14 +871,16 @@ void Folder::removePathFromSelectiveSyncList(const QString &path, const SyncJour
 
 void Folder::whitelistPath(const QString &path)
 {
-    appendPathToSelectiveSyncList(path, SyncJournalDb::SelectiveSyncWhiteList);
     removePathFromSelectiveSyncList(path, SyncJournalDb::SelectiveSyncUndecidedList);
+    removePathFromSelectiveSyncList(path, SyncJournalDb::SelectiveSyncBlackList);
+    appendPathToSelectiveSyncList(path, SyncJournalDb::SelectiveSyncWhiteList);
 }
 
 void Folder::blacklistPath(const QString &path)
 {
-    appendPathToSelectiveSyncList(path, SyncJournalDb::SelectiveSyncBlackList);
     removePathFromSelectiveSyncList(path, SyncJournalDb::SelectiveSyncUndecidedList);
+    removePathFromSelectiveSyncList(path, SyncJournalDb::SelectiveSyncWhiteList);
+    appendPathToSelectiveSyncList(path, SyncJournalDb::SelectiveSyncBlackList);
 }
 
 bool Folder::isFileExcludedAbsolute(const QString &fullPath) const