From 356017a54129b5ed9a5193a7dd333b85be848a91 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 6 Mar 2019 19:27:42 +0000 Subject: [PATCH] Entry sync: also generate UUIDs for first synced deleted entries This fixes a bug with deleting entries that were never synced before. To reproduce: 1. Turn off wifi + data (to ensure nothing is synced). 2. Add an entry (event/task/contact). 3. Delete that entry. 4. Turn wifi + data back on 5. Hit sync --- .../com/etesync/syncadapter/syncadapter/SyncManager.kt | 8 +++++++- 1 file changed, 7 insertions(+), 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 4b4896de..2703e618 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt @@ -479,7 +479,13 @@ constructor(protected val context: Context, protected val account: Account, prot if (Thread.interrupted()) return ret - App.log.info(local.uuid + " has been deleted locally -> deleting from server") + if (local.uuid != null) { + App.log.info(local.uuid + " has been deleted locally -> deleting from server") + } else { + App.log.fine("Entry deleted before ever syncing - genarting a UUID") + local.prepareForUpload() + } + ret.add(local) syncResult.stats.numDeletes++