Merge tag '9.5'

CHANGELOG.md

@@ -1,11 +1,12 @@
 Change Log
 ---
 =======
-### 9.5 (2020-06-01)
+### 9.5 (2020-06-03)
 
 * Drag and drop to change subtasks in all list types
 * Drag and drop to reprioritize or reschedule tasks while sorting by due date
   or priority
+* Bug fixes
 * Update translations
   * Basque - @osoitz
   * Czech - Radek Řehořek

app/build.gradle.kts

@@ -42,7 +42,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90500
+        versionCode = 90501
         versionName = "9.5"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)

app/src/main/java/org/tasks/tasklist/TaskViewHolder.java

@@ -247,7 +247,9 @@ public class TaskViewHolder extends RecyclerView.ViewHolder {
         dueDate.setTextColor(textColorSecondary);
       }
       String dateValue;
-      if (sortMode == SortHelper.SORT_DUE && task.sortGroup != null && newDateTime(task.sortGroup).startOfDay().equals(newDateTime(task.getDueDate()).startOfDay())) {
+      if (sortMode == SortHelper.SORT_DUE
+          && task.sortGroup != null
+          && !preferences.getBoolean(R.string.p_disable_subtasks, false)) {
         dateValue =
             task.hasDueTime() ? getTimeString(context, newDateTime(task.getDueDate())) : null;
       } else {

app/src/main/res/values/changelog.xml

@@ -3,6 +3,6 @@
     <string-array name="changelog">
         <item>Drag and drop to change subtasks in all list types</item>
         <item>Drag and drop to reprioritize or reschedule tasks while sorting by due date or priority</item>
-        <item>Update translations</item>
+        <item>Bug fixes and translation updates</item>
     </string-array>
 </resources>

fastlane/metadata/android/en-US/changelogs/90501.txt

@@ -1,4 +1,5 @@
 * Drag and drop to change subtasks in all list types
 * Drag and drop to reprioritize or reschedule tasks while sorting by due date
   or priority
+* Bug fixes
 * Update translations