mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 03:01:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Run uploadDirty() regardless of processLocallyDeleted() result (bitfireAT/davx5#510)

Browse source 
Run uploadDirty() regardless of whether processLocallyDeleted() did something or not
This commit is contained in:
Ricki Hirner 2024-01-05 11:14:24 +01:00
parent 6b660c2be6
commit cf0c3040fc
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/at/bitfire/davdroid/syncadapter/SyncManager.kt
View file

@ -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")