From b421c6730e1c654319cb79019c518f23866e4041 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 9 Apr 2020 09:09:08 -0500 Subject: [PATCH] Fix move between EteSync lists --- app/src/main/java/org/tasks/data/CaldavTask.java | 4 ++++ app/src/main/java/org/tasks/etesync/EteSynchronizer.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/tasks/data/CaldavTask.java b/app/src/main/java/org/tasks/data/CaldavTask.java index 17898bad5..fd60ee975 100644 --- a/app/src/main/java/org/tasks/data/CaldavTask.java +++ b/app/src/main/java/org/tasks/data/CaldavTask.java @@ -186,4 +186,8 @@ public class CaldavTask { + '\'' + '}'; } + + public boolean isDeleted() { + return deleted > 0; + } } diff --git a/app/src/main/java/org/tasks/etesync/EteSynchronizer.java b/app/src/main/java/org/tasks/etesync/EteSynchronizer.java index 5de62c2a3..6a16c681d 100644 --- a/app/src/main/java/org/tasks/etesync/EteSynchronizer.java +++ b/app/src/main/java/org/tasks/etesync/EteSynchronizer.java @@ -255,7 +255,11 @@ public class EteSynchronizer { case DELETE: dirty.remove(remoteId); if (caldavTask != null) { - taskDeleter.delete(caldavTask.getTask()); + if (caldavTask.isDeleted()) { + caldavDao.delete(caldavTask); + } else { + taskDeleter.delete(caldavTask.getTask()); + } } break; }