From 45c782c4105a0922f6694a84e2d384e5497bfbbc Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 14 Oct 2020 16:49:45 -0500
Subject: [PATCH] Add 'Due time' to default hide until

---
 app/src/main/java/com/todoroo/astrid/data/Task.kt    | 12 +++++++-----
 .../com/todoroo/astrid/ui/HideUntilControlSet.kt     |  1 +
 app/src/main/res/values/arrays.xml                   |  1 +
 app/src/main/res/values/keys.xml                     |  1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/data/Task.kt b/app/src/main/java/com/todoroo/astrid/data/Task.kt
index 60cdd1051..918ccc552 100644
--- a/app/src/main/java/com/todoroo/astrid/data/Task.kt
+++ b/app/src/main/java/com/todoroo/astrid/data/Task.kt
@@ -15,7 +15,10 @@ import org.tasks.Strings
 import org.tasks.backup.XmlReader
 import org.tasks.data.Tag
 import org.tasks.date.DateTimeUtils
+import org.tasks.date.DateTimeUtils.newDateTime
+import org.tasks.date.DateTimeUtils.toDateTime
 import org.tasks.time.DateTime
+import org.tasks.time.DateTimeUtils.startOfDay
 import timber.log.Timber
 import java.util.*
 
@@ -217,13 +220,12 @@ class Task : Parcelable {
         if (date <= 0) {
             return date
         }
-        var hideUntil = DateTimeUtils.newDateTime(date).withMillisOfSecond(0) // get rid of millis
-        hideUntil = if (setting != HIDE_UNTIL_SPECIFIC_DAY_TIME && setting != HIDE_UNTIL_DUE_TIME) {
-            hideUntil.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0)
+        return if (setting == HIDE_UNTIL_SPECIFIC_DAY_TIME ||
+                setting == HIDE_UNTIL_DUE_TIME && hasDueTime(dueDate)) {
+            date.toDateTime().withSecondOfMinute(1).withMillisOfSecond(0).millis
         } else {
-            hideUntil.withSecondOfMinute(1)
+            date.startOfDay()
         }
-        return hideUntil.millis
     }
 
     /** Checks whether this due date has a due time or only a date  */
diff --git a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.kt b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.kt
index 31cd5618e..9c1f409c2 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.kt
+++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.kt
@@ -104,6 +104,7 @@ class HideUntilControlSet : TaskEditControlFragment(), OnItemSelectedListener {
                 if (viewModel.isNew) {
                     when (preferences.getIntegerFromString(R.string.p_default_hideUntil_key, Task.HIDE_UNTIL_NONE)) {
                         Task.HIDE_UNTIL_DUE -> selection = 1
+                        Task.HIDE_UNTIL_DUE_TIME -> selection = 2
                         Task.HIDE_UNTIL_DAY_BEFORE -> selection = 3
                         Task.HIDE_UNTIL_WEEK_BEFORE -> selection = 4
                     }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1f8d76415..e17b8b9fd 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -19,6 +19,7 @@
   <string-array name="EPr_default_hideUntil">
     <item>@string/dont_hide</item>
     <item>@string/due_date</item>
+    <item>@string/due_time</item>
     <item>@string/day_before_due</item>
     <item>@string/week_before_due</item>
   </string-array>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index a14008daf..76887d836 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -166,6 +166,7 @@
     <!-- hideUntil: labels that map EPr_default_hideUntil items to index in TEA_hideUntil. -->
     <item>0</item>
     <item>1</item>
+    <item>6</item>
     <item>2</item>
     <item>3</item>
   </string-array>