Fix null pointer when checking hide until value

pull/1111/head
Alex Baker 5 years ago
parent 58425e8bf1
commit 7ab63bce9c

@ -196,8 +196,8 @@ class Task : Parcelable {
/** Checks whether task is done. Requires DUE_DATE */ /** Checks whether task is done. Requires DUE_DATE */
fun hasDueDate() = dueDate > 0 fun hasDueDate() = dueDate > 0
fun createHideUntil(value: HideUntilControlSet.HideUntilValue) = fun createHideUntil(value: HideUntilControlSet.HideUntilValue?) =
createHideUntil(value.setting, value.date) value?.let { createHideUntil(it.setting, it.date) } ?: 0
/** /**
* Create hide until for this task. * Create hide until for this task.

@ -90,7 +90,6 @@ class TaskEditViewModel @ViewModelInject constructor(
var dueDate: Long? = null var dueDate: Long? = null
get() = field ?: task?.dueDate ?: 0 get() = field ?: task?.dueDate ?: 0
set(value) { set(value) {
val oldDueDate = dueDate!!
field = when { field = when {
value == null -> null value == null -> null
value == 0L -> 0 value == 0L -> 0
@ -255,7 +254,7 @@ class TaskEditViewModel @ViewModelInject constructor(
it.dueDate != dueDate || it.dueDate != dueDate ||
it.priority != priority || it.priority != priority ||
it.notes != description || it.notes != description ||
it.hideUntil != it.createHideUntil(hideUntilValue!!) || it.hideUntil != it.createHideUntil(hideUntilValue) ||
if (it.recurrence.isNullOrBlank()) { if (it.recurrence.isNullOrBlank()) {
!recurrence.isNullOrBlank() !recurrence.isNullOrBlank()
} else { } else {
@ -292,7 +291,7 @@ class TaskEditViewModel @ViewModelInject constructor(
it.dueDate = dueDate!! it.dueDate = dueDate!!
it.priority = priority!! it.priority = priority!!
it.notes = description it.notes = description
it.hideUntil = it.createHideUntil(hideUntilValue!!) it.hideUntil = it.createHideUntil(hideUntilValue)
it.recurrence = recurrence it.recurrence = recurrence
it.repeatUntil = repeatUntil!! it.repeatUntil = repeatUntil!!
it.elapsedSeconds = elapsedSeconds!! it.elapsedSeconds = elapsedSeconds!!

Loading…
Cancel
Save