From 4e472e5ff3cc00cab880bce7f7d0091dde4db3c4 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 15 Dec 2020 12:44:28 +0200 Subject: [PATCH] Sync: don't override item UID if already set. This fixes an issue with tasks.org tasks getting mangled. Fixes #161 and potentially fixes #159. --- .../java/com/etesync/syncadapter/syncadapter/SyncManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt index da35706d..8ff0d4ae 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt @@ -651,7 +651,7 @@ constructor(protected val context: Context, protected val account: Account, prot item = cacheItem.item itemUpdateMtime(item) } else { - val uid = UUID.randomUUID().toString() + val uid = local.uuid ?: UUID.randomUUID().toString() val meta = ItemMetadata() meta.name = uid meta.mtime = System.currentTimeMillis()