From: Christian Kamm <mail@ckamm.de>
Date: Fri, 31 Aug 2018 13:50:54 +0000 (+0200)
Subject: Virtual files: Wipe selective sync settings when enabled
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~468
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dd34cbc751b142277a71076864d285597c70484d;p=nextcloud-desktop.git

Virtual files: Wipe selective sync settings when enabled
---

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index dc4a2e254..e7d77e4b1 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -454,6 +454,16 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
             OwncloudWizard::askExperimentalVirtualFilesFeature([folder, this](bool enable) {
                 if (enable && folder)
                     folder->setUseVirtualFiles(enable);
+
+                // Also wipe selective sync settings
+                bool ok = false;
+                auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
+                folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
+                for (const auto &entry : oldBlacklist) {
+                    folder->journalDb()->avoidReadFromDbOnNextSync(entry);
+                }
+                FolderMan::instance()->scheduleFolder(folder);
+
                 // Make sure the size is recomputed as the virtual file indicator changes
                 _ui->_folderList->doItemsLayout();
             });