From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 20 Dec 2022 11:40:42 +0000 (+0100)
Subject: Make sure to add e2ee files to normal blacklist too
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~30^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d208ec06e591b825f404366246b820d825ff52a;p=nextcloud-desktop.git

Make sure to add e2ee files to normal blacklist too

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

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index f335702f0..05e2a07a4 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1355,7 +1355,13 @@ void Folder::removeLocalE2eFiles()
 
     qCInfo(lcFolder) << "About to blacklist: " << e2eFoldersToBlacklist;
 
+    bool ok = false;
+    const auto existingBlacklist = _journal.getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
+    Q_ASSERT(ok);
+
     // Will get deleted from blacklist if encryption is set up again later
+    const auto expandedBlacklist = existingBlacklist + e2eFoldersToBlacklist;
+    _journal.setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, expandedBlacklist);
     _journal.setSelectiveSyncList(SyncJournalDb::SelectiveSyncE2eFoldersToRemoveFromBlacklist, e2eFoldersToBlacklist);
 
     setSyncPaused(currentSyncPaused);