Fix RepeatControlSet.hasChanges

4 years ago · 5dcc6a1e56
parent b7e13eb796
commit 5dcc6a1e56
1 changed files with 3 additions and 3 deletions
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
@ -177,9 +177,9 @@ class RepeatControlSet : TaskEditControlFragment() {
    override fun controlId() = TAG

    override fun hasChanges(original: Task): Boolean {
-        return (recurrenceValue != original.recurrence
-                || original.repeatUntil
-                != if (rrule == null) 0 else DateTime.from(rrule!!.until).millis)
+        val repeatUntil = rrule?.let { DateTime.from(it.until).millis } ?: 0
+        return recurrenceValue != original.recurrence.orEmpty()
+                || original.repeatUntil != repeatUntil
    }

    override fun apply(task: Task) {