Merge tag '11.0.1' into main

CHANGELOG.md

@@ -1,7 +1,8 @@
-### 11.0.1 (2020-12-16)
+### 11.0.1 (2020-12-17)
 
 * Fix EteSync client issue with v2 accounts
   ([b761309](https://github.com/tasks/tasks/commit/b76130902ae0be6e1d580d588798a9ed0d7ff385))
+* Fix multi-select 'Pick time' crash
 * Fix default hide until due time
   ([#842](https://github.com/tasks/tasks/issues/842#issuecomment-746358382))
 * Add Croatian translations - Garden Hose

app/build.gradle.kts

@@ -44,7 +44,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 110009
+        versionCode = 110010
         versionName = "11.0.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)

app/src/main/java/org/tasks/dialogs/DateTimePicker.kt

@@ -231,10 +231,11 @@ class DateTimePicker : BottomSheetDialogFragment() {
 
     @OnClick(R.id.pick_time_button)
     fun pickTime() {
-        val time = if (Task.hasDueTime(today.withMillisOfDay(selectedTime).millis)) {
-            selectedTime
-        } else {
+        val time = if (selectedTime == MULTIPLE_TIMES
+                || !Task.hasDueTime(today.withMillisOfDay(selectedTime).millis)) {
             today.noon().millisOfDay
+        } else {
+            selectedTime
         }
         newTimePicker(this, REQUEST_TIME, today.withMillisOfDay(time).millis)
                 .show(parentFragmentManager, FRAG_TAG_TIME_PICKER)

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

@@ -1,4 +1,5 @@
 * Fix EteSync client issue with v2 accounts
   * Some fields were reset for new tasks after first sync
+* Fix multi-select 'Pick time' crash
 * Fix default hide until due time
-* Update translations
+* Update translations