From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 5 Jul 2023 18:38:49 +0000 (+0800)
Subject: Ensure folder whitelist and blacklist helper methods remove path from other lists
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~57^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6682b3ade4f526db5226e3989b7215a53fe1c0eb;p=nextcloud-desktop.git

Ensure folder whitelist and blacklist helper methods remove path from other lists

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 205ab534f..d40017dec 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -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