diff options
| author | desperateCoder <echotodevnull@gmail.com> | 2020-11-22 20:37:35 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-11-22 21:02:36 +0300 |
| commit | 727a31ef4a9eb30333dc3694539342eb7bf624ed (patch) | |
| tree | 43f80f43776a6bc1485e1fedf7d54eb8e198e967 /app/src/main/java/it | |
| parent | 472d3d3a3a5be76228400dbd284c81744583def1 (diff) | |
#359 etags: fixed downsync on old server app versions
Diffstat (limited to 'app/src/main/java/it')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java index 7a88128e0..e3e1ae487 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java @@ -56,7 +56,7 @@ public class SyncHelper { DeckLog.log("Conflicting changes on entity: " + existingEntity); // TODO: what to do? } else { - if (entityFromServer.getEtag() != null && entityFromServer.getEtag().equals(existingEntity.getEtag())) { + if (entityFromServer.getEtag() != null && !entityFromServer.getEtag().trim().isEmpty() && entityFromServer.getEtag().equals(existingEntity.getEtag())) { DeckLog.info("["+provider.getClass().getSimpleName()+"] ETags do match! skipping Entitiy with localId: "+existingEntity.getLocalId()); continue; } |