Clean up FolderMan::setupFolderFromOldConfigFile.

Signed-off-by: Camila <hello@camila.codes>
nextcloud · Sep 12, 2023 · cbfb60d · cbfb60d
1 parent 8193db6
commit cbfb60d
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -565,23 +565,19 @@ void FolderMan::setupFolderFromOldConfigFile(const QString &fileNamePath, Accoun
 
         if (const auto folder = addFolderInternal(folderDefinition, accountState, std::make_unique<VfsOff>())) {
             auto ok = true;
-            if (const auto legacyBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
-                                                                                       &ok); ok && !legacyBlacklist.isEmpty()) {
+            auto legacyBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
+                                                                                   &ok);
+            if (!ok) {
+                qCInfo(lcFolderMan) << "There was a problem retriving the database selective sync for " << folder;
+            }
+
+            legacyBlacklist << settings.value(QLatin1String("blackList")).toStringList();
+            if (!legacyBlacklist.isEmpty()) {
                 qCInfo(lcFolderMan) << "Legacy selective sync list found:" << legacyBlacklist;
                 for (const auto &legacyFolder : legacyBlacklist) {
                     folder->migrateBlackListPath(legacyFolder);
                 }
-            } else {
-                qCInfo(lcFolderMan) << "There was a problem retriving the database selective sync for " << folder;
-            }
-
-            const auto settingLegacyBlacklist = settings.value(QLatin1String("blackList")).toStringList();
-            if (!settingLegacyBlacklist.empty()) {
-                // migrate settings
-                folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, settingLegacyBlacklist);
                 settings.remove(QLatin1String("blackList"));
-                // FIXME: If you remove this codepath, you need to provide another way to do
-                // this via theme.h or the normal FolderMan::setupFolders
             }
 
             folder->saveToSettings();