Fix tests

pull/3348/head
Alex Baker 10 months ago
parent 16a16500fb
commit c21c65b62b

@ -127,7 +127,7 @@ class TaskEditViewModel @Inject constructor(
val tags: ImmutableSet<TagData>, val tags: ImmutableSet<TagData>,
val calendar: String?, val calendar: String?,
val attachments: ImmutableSet<TaskAttachment> = persistentSetOf(), val attachments: ImmutableSet<TaskAttachment> = persistentSetOf(),
val alarms: ImmutableSet<Alarm> = persistentSetOf(), val alarms: ImmutableSet<Alarm>,
val newSubtasks: ImmutableList<Task> = persistentListOf(), val newSubtasks: ImmutableList<Task> = persistentListOf(),
val multilineTitle: Boolean, val multilineTitle: Boolean,
) { ) {
@ -178,6 +178,24 @@ class TaskEditViewModel @Inject constructor(
.mapNotNull { controlSetStrings[it] } .mapNotNull { controlSetStrings[it] }
.toPersistentList() .toPersistentList()
}, },
alarms = if (task.isNew) {
ArrayList<Alarm>().apply {
if (task.isNotifyAtStart) {
add(whenStarted(0))
}
if (task.isNotifyAtDeadline) {
add(whenDue(0))
}
if (task.isNotifyAfterDeadline) {
add(whenOverdue(0))
}
if (task.randomReminder > 0) {
add(Alarm(time = task.randomReminder, type = Alarm.TYPE_RANDOM))
}
}
} else {
emptyList()
}.toPersistentSet(),
multilineTitle = preferences.multilineTitle, multilineTitle = preferences.multilineTitle,
location = null, location = null,
tags = persistentSetOf(), tags = persistentSetOf(),
@ -604,20 +622,7 @@ class TaskEditViewModel @Inject constructor(
} }
val alarms = async { val alarms = async {
if (task.isNew) { if (task.isNew) {
ArrayList<Alarm>().apply { originalState.value.alarms
if (task.isNotifyAtStart) {
add(whenStarted(0))
}
if (task.isNotifyAtDeadline) {
add(whenDue(0))
}
if (task.isNotifyAfterDeadline) {
add(whenOverdue(0))
}
if (task.randomReminder > 0) {
add(Alarm(time = task.randomReminder, type = Alarm.TYPE_RANDOM))
}
}
} else { } else {
alarmDao.getAlarms(task.id) alarmDao.getAlarms(task.id)
}.toPersistentSet() }.toPersistentSet()

Loading…
Cancel
Save