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 f335702f0fac24e2947340f1b475a8bd67319d1c..05e2a07a41af3904920936609bdcece8d3aefe32 100644 (file)
--- 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);