Fix due time when rescheduling via drag and drop

4 years ago · 97264545d8
parent e5a5c9b264
commit 97264545d8
1 changed files with 4 additions and 4 deletions
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
@ -213,10 +213,10 @@ open class TaskAdapter(
    private suspend fun applyDate(task: Task, date: Long) {
        val original = task.dueDate
-        task.setDueDateAdjustingHideUntil(if (date == 0L) {
+        task.setDueDateAdjustingHideUntil(when {
-            0L
+            date == 0L -> 0L
-        } else {
+            task.hasDueTime() -> date.toDateTime().withMillisOfDay(task.dueDate.toDateTime().millisOfDay).millis
-            date.toDateTime().withMillisOfDay(task.dueDate.toDateTime().millisOfDay).millis
+            else -> Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, date)
        })
        if (original != task.dueDate) {
            taskDao.save(task)