Fix check for ring flag changes

2 years ago · a5e0a06762
parent 25ab16faa8
commit a5e0a06762
2 changed files with 5 additions and 7 deletions
--- a/app/src/main/java/org/tasks/db/Migrations.kt
+++ b/app/src/main/java/org/tasks/db/Migrations.kt
@ -449,12 +449,6 @@ object Migrations {
            database.execSQL(
                "INSERT INTO `alarms` (`task`, `time`, `type`) SELECT `_id`, `snoozeTime`, $TYPE_SNOOZE FROM `tasks` WHERE `snoozeTime` > 0"
            )
-            database.execSQL(
-                "UPDATE `tasks` SET `notificationFlags` = $NOTIFY_MODE_FIVE WHERE `notificationFlags` & $NOTIFY_MODE_FIVE = $NOTIFY_MODE_FIVE"
-            )
-            database.execSQL(
-                "UPDATE `tasks` SET `notificationFlags` = $NOTIFY_MODE_NONSTOP WHERE `notificationFlags` & $NOTIFY_MODE_NONSTOP = $NOTIFY_MODE_NONSTOP"
-            )
        }
    }

--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@ -310,7 +310,11 @@ class TaskEditViewModel @Inject constructor(
                originalLocation != selectedLocation ||
                originalTags.toHashSet() != selectedTags.toHashSet() ||
                newSubtasks.isNotEmpty() ||
-                task.ringFlags != getRingFlags() ||
+                getRingFlags() != when {
+                    task.isNotifyModeFive -> NOTIFY_MODE_FIVE
+                    task.isNotifyModeNonstop -> NOTIFY_MODE_NONSTOP
+                    else -> 0
+                } ||
                originalAlarms.toHashSet() != selectedAlarms.value.toHashSet()

    fun cleared() = cleared.value?.value == true