diff options
author | Christian Kamm <mail@ckamm.de> | 2019-02-13 16:18:54 +0300 |
---|---|---|
committer | ckamm <mail@ckamm.de> | 2019-02-14 12:57:09 +0300 |
commit | a627f373b1254c081535fc7ecbcdeb7f6ea3708d (patch) | |
tree | 24e9e8e414676f6649e146f7cb1d7cdfc889be06 /src/gui/selectivesyncdialog.cpp | |
parent | cf4ffd8c7e1d922848ad1e75d1b568e0e714a024 (diff) |
Ensure local discovery on selective sync changesloai_docs
As far as I'm aware local discovery can be skipped on folders that are
selective-sync blacklisted, so a local discovery is required when an
entry is removed from the blacklist.
Also rename
avoidReadFromDbOnNextSync() -> schedulePathForRemoteDiscovery()
since the old name might also imply it's not read from db in the local
discovery - which is not the case. Use Folder::
schedulePathForLocalDiscovery() for that.
Diffstat (limited to 'src/gui/selectivesyncdialog.cpp')
-rw-r--r-- | src/gui/selectivesyncdialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 92afbce5d..b924bb110 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -490,7 +490,8 @@ void SelectiveSyncDialog::accept() auto blackListSet = blackList.toSet(); auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet); foreach (const auto &it, changes) { - _folder->journalDb()->avoidReadFromDbOnNextSync(it); + _folder->journalDb()->schedulePathForRemoteDiscovery(it); + _folder->schedulePathForLocalDiscovery(it); } // Also make sure we see the local file that had been ignored before _folder->slotNextSyncFullLocalDiscovery(); |