mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-09-06 18:01:11 +00:00
Run uploadDirty() regardless of processLocallyDeleted() result (bitfireAT/davx5#510)
Run uploadDirty() regardless of whether processLocallyDeleted() did something or not
This commit is contained in:
parent
6b660c2be6
commit
cf0c3040fc
|
@ -164,7 +164,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
|
|||
var remoteSyncState = queryCapabilities()
|
||||
|
||||
Logger.log.info("Processing local deletes/updates")
|
||||
val modificationsPresent = processLocallyDeleted() || uploadDirty()
|
||||
val modificationsPresent = processLocallyDeleted() or uploadDirty() // bitwise OR guarantees that both expressions are evaluated
|
||||
|
||||
if (extras.contains(Syncer.SYNC_EXTRAS_FULL_RESYNC)) {
|
||||
Logger.log.info("Forcing re-synchronization of all entries")
|
||||
|
|
Loading…
Reference in a new issue