Commit 6b952028 authored by Ricki Hirner's avatar Ricki Hirner

Collection sync: mark skipped entries as locally present

parent 3944ab02
Pipeline #21347339 passed with stages
in 20 minutes and 8 seconds
......@@ -18,7 +18,7 @@ android {
defaultConfig {
applicationId "at.bitfire.davdroid"
versionCode 216
versionCode 217
buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
buildConfigField "boolean", "customCerts", "true"
......@@ -33,7 +33,7 @@ android {
productFlavors {
standard {
versionName "1.11.2-beta1-ose"
versionName "1.11.2-beta2-ose"
buildConfigField "boolean", "customCerts", "true"
}
......
......@@ -262,6 +262,9 @@ abstract class BaseDavSyncManager<ResourceType: LocalResource<*>, out Collection
if (local.eTag == remoteETag) {
Logger.log.info("${local.fileName} is already available with ETag $remoteETag, skipping update")
skip = true
// mark as remotely present, so that this resource won't be deleted at the end
local.updateFlags(LocalResource.FLAG_REMOTELY_PRESENT)
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment