Fix finishing recurrence

7 months ago · c210fe1893
parent 26aa916c20
commit c210fe1893
2 changed files with 9 additions and 2 deletions
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt
@ -81,7 +81,11 @@ class RepeatTaskHelper @Inject constructor(
    }

    suspend fun undoRepeat(task: Task, oldDueDate: Long) {
-        task.completionDate = 0L
+        if (task.completionDate > 0) {
+            task.completionDate = 0
+            taskDao.save(task)
+            return
+        }
        try {
            val recur = newRecur(task.recurrence!!)
            val count = recur.count
--- a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
@ -84,7 +84,10 @@ class TaskCompleter @Inject internal constructor(

                        if (caldavDao.getAccountForTask(task.id)?.isSuppressRepeatingTasks != true) {
                            repeatTaskHelper.handleRepeat(task)
-                            setComplete(task, false)
+                            if (task.completionDate == 0L) {
+                                // un-complete children
+                                setComplete(task, false)
+                            }
                        }
                    }
                }