Add start date reminders to default preferences

app/src/main/java/com/todoroo/astrid/service/Upgrade_11_12.kt

@@ -0,0 +1,32 @@
+@file:Suppress("ClassName")
+
+package com.todoroo.astrid.service
+
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE
+import org.tasks.R
+import org.tasks.preferences.Preferences
+import javax.inject.Inject
+
+class Upgrade_11_12 @Inject constructor(
+    private val preferences: Preferences
+) {
+    internal fun migrateDefaultReminderPreference() {
+        val pref = preferences.getIntegerFromString(
+            LEGACY_PREFERENCE,
+            NOTIFY_AT_DEADLINE or NOTIFY_AFTER_DEADLINE
+        )
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            listOf(NOTIFY_AT_DEADLINE, NOTIFY_AFTER_DEADLINE)
+                .filter { pref and it > 0 }
+                .map { it.toString() }
+                .toHashSet()
+        )
+    }
+
+    companion object {
+        const val VERSION = 111200
+        private const val LEGACY_PREFERENCE = "p_def_reminders"
+    }
+}

app/src/main/java/com/todoroo/astrid/service/Upgrader.kt

@@ -43,7 +43,9 @@ class Upgrader @Inject constructor(
         private val widgetManager: AppWidgetManager,
         private val taskMover: TaskMover,
         private val upgraderDao: UpgraderDao,
-        private val upgrade_11_3: Lazy<Upgrade_11_3>) {
+        private val upgrade_11_3: Lazy<Upgrade_11_3>,
+        private val upgrade_11_12: Lazy<Upgrade_11_12>,
+) {
 
     fun upgrade(from: Int, to: Int) {
         if (from > 0) {
@@ -78,6 +80,11 @@ class Upgrader @Inject constructor(
                     applyOpenTaskStartDates()
                 }
             }
+            run(from, Upgrade_11_12.VERSION) {
+                with(upgrade_11_12.get()) {
+                    migrateDefaultReminderPreference()
+                }
+            }
             preferences.setBoolean(R.string.p_just_updated, true)
         }
         preferences.setCurrentVersion(to)

app/src/main/java/org/tasks/preferences/Preferences.kt

@@ -18,6 +18,8 @@ import com.todoroo.astrid.activity.BeastModePreferences
 import com.todoroo.astrid.api.AstridApiConstants
 import com.todoroo.astrid.core.SortHelper
 import com.todoroo.astrid.data.Task
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE
 import org.tasks.BuildConfig
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
@@ -104,21 +106,19 @@ class Preferences @JvmOverloads constructor(
 
     val purchases: List<Purchase>
         get() = try {
-            prefs.getStringSet(context.getString(R.string.p_purchases), emptySet())!!.map(::Purchase)
+            getStringSet(R.string.p_purchases).map(::Purchase)
         } catch (e: Exception) {
             Timber.e(e)
             emptyList()
         }
 
     fun setPurchases(purchases: Collection<Purchase>) {
-        setPurchases(purchases.mapNotNull(Purchase::toJson).toHashSet())
+        setPurchases(purchases.map(Purchase::toJson).toHashSet())
     }
 
-    fun setPurchases(set: HashSet<String>) {
+    private fun setPurchases(set: HashSet<String>) {
         try {
-            val editor = prefs.edit()
-            editor.putStringSet(context.getString(R.string.p_purchases), set)
-            editor.apply()
+            setStringSet(R.string.p_purchases, set)
         } catch (e: Exception) {
             Timber.e(e)
         }
@@ -194,9 +194,16 @@ class Preferences @JvmOverloads constructor(
         null
     }
 
+    val defaultRemindersSet: Set<String>
+        get() = getStringSet(
+            R.string.p_default_reminders_key,
+            listOf(NOTIFY_AT_DEADLINE, NOTIFY_AFTER_DEADLINE).map { it.toString() }.toSet()
+        )
+
     val defaultReminders: Int
-        get() = getIntegerFromString(
-                R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE or Task.NOTIFY_AFTER_DEADLINE)
+        get() = defaultRemindersSet
+            .mapNotNull { it.toIntOrNull() }
+            .fold(0) { v, e -> v + (1 shl e) }
 
     val defaultRingMode: Int
         get() = getIntegerFromString(R.string.p_default_reminders_mode_key, 0)
@@ -236,6 +243,21 @@ class Preferences @JvmOverloads constructor(
         editor.apply()
     }
 
+    fun setStringSet(key: Int, newValue: HashSet<String>) =
+        setStringSet(context.getString(key), newValue)
+
+    private fun setStringSet(key: String, newValue: HashSet<String>) {
+        val editor = prefs.edit()
+        editor.putStringSet(key, newValue)
+        editor.apply()
+    }
+
+    fun getStringSet(key: Int, defaultValue: Set<String> = emptySet()) =
+        getStringSet(context.getString(key), defaultValue)
+
+    private fun getStringSet(key: String, defaultValue: Set<String> = emptySet()): Set<String> =
+        prefs.getStringSet(key, defaultValue)!!
+
     fun setStringFromInteger(keyResource: Int, newValue: Int) {
         val editor = prefs.edit()
         editor.putString(context.getString(keyResource), newValue.toString())

app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt

@@ -9,6 +9,9 @@ import androidx.preference.Preference
 import com.todoroo.astrid.api.CaldavFilter
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.api.GtasksFilter
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE
+import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_START
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.tasks.R
@@ -108,6 +111,11 @@ class TaskDefaults : InjectingPreferenceFragment() {
                     false
                 }
 
+        findPreference(R.string.p_default_reminders_key).setOnPreferenceChangeListener { _, newValue ->
+            updateDefaultReminders(newValue as Collection<String>)
+            true
+        }
+
         updateRemoteListSummary()
         updateRecurrence()
         updateDefaultLocation()
@@ -168,6 +176,7 @@ class TaskDefaults : InjectingPreferenceFragment() {
         updateRecurrence()
         updateDefaultLocation()
         updateTags()
+        updateDefaultReminders()
     }
 
     private fun getDefaultCalendarName(): String? {
@@ -214,6 +223,23 @@ class TaskDefaults : InjectingPreferenceFragment() {
                         ?: requireContext().getString(R.string.none)
     }
 
+    private fun updateDefaultReminders(prefs: Collection<String> = preferences.defaultRemindersSet) {
+        findPreference(R.string.p_default_reminders_key).summary =
+            if (prefs.isEmpty()) {
+                getString(R.string.no_reminders)
+            } else {
+                prefs.mapNotNull {
+                    when (1 shl it.toInt()) {
+                        NOTIFY_AT_DEADLINE -> getString(R.string.when_due)
+                        NOTIFY_AFTER_DEADLINE -> getString(R.string.when_overdue)
+                        NOTIFY_AT_START -> getString(R.string.when_started)
+                        else -> null
+                    }
+                }
+                    .joinToString("\n")
+            }
+    }
+
     private fun updateRecurrence() {
         val rrule = preferences.getStringValue(R.string.p_default_recurrence)
         findPreference(R.string.p_default_recurrence).summary =

app/src/main/res/values-ar/strings.xml

@@ -407,7 +407,6 @@
     <string name="default_location_reminder_on_arrival_or_departure">عند الوصول والمغادرة</string>
     <string name="default_location_reminder_on_departure">عند المغادرة</string>
     <string name="default_location_reminder_on_arrival">عند الوصول</string>
-    <string name="at_deadline">عند الموعد النهائي</string>
     <string name="EPr_manage_delete_completed_gcal_message">هل حقًّا تريد حذف كل أحداثك للمهام المتمّمة؟</string>
     <string name="TEA_add_subtask">أضف مهمّة فرعيّة</string>
     <string name="invite_invalid">الدعوة غير صالحة</string>
@@ -664,7 +663,6 @@
     <string name="gtasks_GLA_authenticating">قيد المصادقة…</string>
     <string name="CFC_gtasks_list_name">في قوائم مهام كوكل…</string>
     <string name="no_due_date">لا تاريخ استحقاق</string>
-    <string name="at_deadline_or_overdue">في الموعد النهائي أو المتأخر</string>
     <string name="EPr_default_location_reminder_title">مذكرات الموقع الافتراضية</string>
     <string name="default_due_date">وقت الاستحقاق الافتراضي</string>
     <string name="EPr_cal_start_at_due_time">بدء أحداث التقويم عند الوقت المحدد</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -99,8 +99,6 @@
     <string name="priority_low">Нисък</string>
     <string name="day_after_tomorrow">Вдругиден</string>
     <string name="next_week">Следваща седмица</string>
-    <string name="at_deadline">В крайния срок</string>
-    <string name="at_deadline_or_overdue">В крайния срок или при просрочие</string>
     <string name="no_reminders">Без напомняния</string>
     <string name="default_location_reminder_on_arrival">При пристигане</string>
     <string name="default_location_reminder_on_departure">При отпътуване</string>

app/src/main/res/values-ca/strings.xml

@@ -166,11 +166,9 @@
     <string name="default_location">Ubicació predeterminada</string>
     <string name="EPr_default_reminders_mode_title">So / vibració predeterminat</string>
     <string name="priority_medium">Mig</string>
-    <string name="at_deadline_or_overdue">Al termini o venciment</string>
     <string name="default_location_reminder_on_arrival">En arribar</string>
     <string name="EPr_default_location_radius">Radi predeterminat</string>
     <string name="priority_low">Baix</string>
-    <string name="at_deadline">Al termini</string>
     <string name="no_reminders">Sense recordatoris</string>
     <string name="default_location_reminder_on_departure">A la sortida</string>
     <string name="default_location_reminder_on_arrival_or_departure">A l’arribada i sortida</string>

app/src/main/res/values-cs/strings.xml

@@ -83,8 +83,6 @@
     <string name="priority_low">Nízká</string>
     <string name="day_after_tomorrow">Pozítří</string>
     <string name="next_week">Příští týden</string>
-    <string name="at_deadline">V termínu</string>
-    <string name="at_deadline_or_overdue">V termínu nebo po něm</string>
     <string name="BFE_Active">Moje úkoly</string>
     <string name="BFE_Recent">Nedávno upravené</string>
     <string name="CFA_button_add">Přidat podmínku</string>

app/src/main/res/values-da/strings.xml

@@ -526,8 +526,6 @@
     <string name="default_location_reminder_on_departure">Ved afgang</string>
     <string name="default_location_reminder_on_arrival">Ved ankomst</string>
     <string name="no_reminders">Ingen påmindelser</string>
-    <string name="at_deadline_or_overdue">Ved frist eller overskredet</string>
-    <string name="at_deadline">Ved frist</string>
     <string name="next_week">Næste uge</string>
     <string name="day_after_tomorrow">I overmorgen</string>
     <string name="priority_low">Lav</string>

app/src/main/res/values-de/strings.xml

@@ -96,8 +96,6 @@
     <string name="priority_low">Niedrig</string>
     <string name="day_after_tomorrow">Übermorgen</string>
     <string name="next_week">Nächste Woche</string>
-    <string name="at_deadline">Zum Termin</string>
-    <string name="at_deadline_or_overdue">Zum Termin oder wenn überfällig</string>
     <string name="no_reminders">Keine Erinnerungen</string>
     <string name="default_location_reminder_on_arrival">Bei Ankunft</string>
     <string name="default_location_reminder_on_departure">Bei Abreise</string>

app/src/main/res/values-el/strings.xml

@@ -77,8 +77,6 @@
     <string name="EPr_default_reminders_mode_title">Προκαθορισμένος ήχος/τύπος δόνησης</string>
     <string name="day_after_tomorrow">Μεθαύριο</string>
     <string name="next_week">Επόμενη εβδομάδα</string>
-    <string name="at_deadline">Στην προθεσμία</string>
-    <string name="at_deadline_or_overdue">Στην λήξη η και μετά</string>
     <string name="custom_filter_or">ή</string>
     <string name="custom_filter_not">μή</string>
     <string name="custom_filter_and">επίσης</string>

app/src/main/res/values-eo/strings.xml

@@ -178,7 +178,6 @@
     <string name="BFE_Recent">Laste modifita</string>
     <string name="default_location_reminder_on_departure">Je foriro</string>
     <string name="no_reminders">Sen memorigiloj</string>
-    <string name="at_deadline">Je datlimo</string>
     <string name="next_week">Sekvanta semajno</string>
     <string name="priority_low">Graveta</string>
     <string name="priority_medium">Mezgrava</string>

app/src/main/res/values-es/strings.xml

@@ -96,8 +96,6 @@
     <string name="priority_low">Baja</string>
     <string name="day_after_tomorrow">Pasado mañana</string>
     <string name="next_week">Semana siguiente</string>
-    <string name="at_deadline">En la fecha límite</string>
-    <string name="at_deadline_or_overdue">En la fecha límite o atrasada</string>
     <string name="no_reminders">Sin recordatorio</string>
     <string name="default_location_reminder_on_arrival">A la llegada</string>
     <string name="default_location_reminder_on_departure">A la salida</string>

app/src/main/res/values-eu/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">Baxua</string>
     <string name="day_after_tomorrow">Etzi</string>
     <string name="next_week">Datorren astean</string>
-    <string name="at_deadline">Epemugan</string>
-    <string name="at_deadline_or_overdue">Epemugan edo hau gaindituta dagoenean</string>
     <string name="no_reminders">Oroigarririk ez</string>
     <string name="default_location_reminder_on_arrival">Heltzean</string>
     <string name="default_location_reminder_on_departure">Ateratzean</string>

app/src/main/res/values-fa/strings.xml

@@ -66,8 +66,6 @@
     <string name="priority_low">کم</string>
     <string name="day_after_tomorrow">پس فردا</string>
     <string name="next_week">هفته بعد</string>
-    <string name="at_deadline">روز موعود</string>
-    <string name="at_deadline_or_overdue">در روز موعد یا پس از موعود</string>
     <string name="BFE_Active">وظایف من</string>
     <string name="BFE_Recent">اخیرا ویرایش شده</string>
     <string name="custom_filter_or">يا</string>

app/src/main/res/values-fi/strings.xml

@@ -90,8 +90,6 @@
     <string name="priority_low">Matala</string>
     <string name="day_after_tomorrow">Ylihuomenna</string>
     <string name="next_week">Ensi viikko</string>
-    <string name="at_deadline">Määräaikana</string>
-    <string name="at_deadline_or_overdue">Määräpäivänä tai yliajalla</string>
     <string name="BFE_Active">Omat tehtävät</string>
     <string name="BFE_Recent">Äskettäin muokattu</string>
     <string name="CFA_button_add">Lisää kriteeri</string>

app/src/main/res/values-fr/strings.xml

@@ -90,8 +90,6 @@
     <string name="priority_low">Faible</string>
     <string name="day_after_tomorrow">Après-demain</string>
     <string name="next_week">La semaine prochaine</string>
-    <string name="at_deadline">À la date limite</string>
-    <string name="at_deadline_or_overdue">À la date limite ou après</string>
     <string name="no_reminders">Aucun rappel</string>
     <string name="default_location_reminder_on_arrival">A l\'arrivée</string>
     <string name="default_location_reminder_on_departure">Au départ</string>

app/src/main/res/values-gl/strings.xml

@@ -88,8 +88,6 @@
     <string name="priority_low">Baja</string>
     <string name="day_after_tomorrow">Pasado mañana</string>
     <string name="next_week">Semana siguiente</string>
-    <string name="at_deadline">En la fecha de vencimiento</string>
-    <string name="at_deadline_or_overdue">En la fecha de vencimiento o ya vencida</string>
     <string name="BFE_Active">Mis Tareas</string>
     <string name="BFE_Recent">Recién modificadas</string>
     <string name="custom_filter_or">ou</string>

app/src/main/res/values-hr/strings.xml

@@ -547,8 +547,6 @@
     <string name="default_location_reminder_on_departure">Pri odlasku</string>
     <string name="default_location_reminder_on_arrival">Pri dolasku</string>
     <string name="no_reminders">Bez podsjetnika</string>
-    <string name="at_deadline_or_overdue">Krajnji rok ili nakon roka</string>
-    <string name="at_deadline">Krajnji rok</string>
     <string name="day_after_tomorrow">Prekosutra</string>
     <string name="priority_low">Niski</string>
     <string name="priority_medium">Srednji</string>

app/src/main/res/values-hu/strings.xml

@@ -95,8 +95,6 @@
     <string name="priority_low">Alacsony</string>
     <string name="day_after_tomorrow">Holnapután</string>
     <string name="next_week">Következő hét</string>
-    <string name="at_deadline">Határidő bekövetkeztekor</string>
-    <string name="at_deadline_or_overdue">Határidő bekövetkeztekor vagy túllépésekor</string>
     <string name="no_reminders">Nincs emlékeztető</string>
     <string name="default_location_reminder_on_arrival">Megérkezéskor</string>
     <string name="default_location_reminder_on_departure">Elinduláskor</string>

app/src/main/res/values-id/strings.xml

@@ -68,8 +68,6 @@
     <string name="priority_low">Rendah</string>
     <string name="day_after_tomorrow">Lusa</string>
     <string name="next_week">Minggu depan</string>
-    <string name="at_deadline">Saat batas waktu</string>
-    <string name="at_deadline_or_overdue">Saat batas waktu atau saat lewat jatuh tempo</string>
     <string name="no_reminders">Tidak ada pengingat</string>
     <string name="BFE_Active">Tugas Saya</string>
     <string name="BFE_Recent">Baru-baru ini diubah</string>

app/src/main/res/values-it/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">Bassa</string>
     <string name="day_after_tomorrow">Dopodomani</string>
     <string name="next_week">Settimana prossima</string>
-    <string name="at_deadline">Alla scadenza</string>
-    <string name="at_deadline_or_overdue">Alla scadenza o già scaduta</string>
     <string name="no_reminders">Nessun promemoria</string>
     <string name="default_location_reminder_on_arrival">All\'arrivo</string>
     <string name="default_location_reminder_on_departure">Alla partenza</string>

app/src/main/res/values-iw/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">נמוך</string>
     <string name="day_after_tomorrow">מחרתיים</string>
     <string name="next_week">בשבוע הבא</string>
-    <string name="at_deadline">במועד הסף</string>
-    <string name="at_deadline_or_overdue">במועד היעד או לאחריו</string>
     <string name="no_reminders">אין תזכורות</string>
     <string name="default_location_reminder_on_arrival">ברגע ההגעה</string>
     <string name="default_location_reminder_on_departure">ברגע העזיבה</string>

app/src/main/res/values-ja/strings.xml

@@ -94,8 +94,6 @@
     <string name="priority_low">低</string>
     <string name="day_after_tomorrow">明後日</string>
     <string name="next_week">来週</string>
-    <string name="at_deadline">期限に</string>
-    <string name="at_deadline_or_overdue">期限または期限を過ぎて</string>
     <string name="no_reminders">リマインダーはありません</string>
     <string name="default_location_reminder_on_arrival">到着時</string>
     <string name="default_location_reminder_on_departure">出発時</string>

app/src/main/res/values-ko/strings.xml

@@ -95,8 +95,6 @@
     <string name="priority_low">낮음</string>
     <string name="day_after_tomorrow">모레</string>
     <string name="next_week">다음 주</string>
-    <string name="at_deadline">완료일에</string>
-    <string name="at_deadline_or_overdue">마감일이나 그 이후</string>
     <string name="no_reminders">알림 없음</string>
     <string name="default_location_reminder_on_arrival">도착 시</string>
     <string name="default_location_reminder_on_departure">출발 시</string>

app/src/main/res/values-lt/strings.xml

@@ -99,8 +99,6 @@
     <string name="priority_low">Žemas</string>
     <string name="day_after_tomorrow">Poryt</string>
     <string name="next_week">Kitą savaitę</string>
-    <string name="at_deadline">Atėjus terminui</string>
-    <string name="at_deadline_or_overdue">Atėjus terminui arba pavėluotai</string>
     <string name="no_reminders">Jokių priminimų</string>
     <string name="default_location_reminder_on_arrival">Atvykus</string>
     <string name="default_location_reminder_on_departure">Išvykstant</string>

app/src/main/res/values-nb/strings.xml

@@ -204,8 +204,6 @@
     <string name="priority_low">Lav</string>
     <string name="day_after_tomorrow">I overimorgen</string>
     <string name="next_week">Neste uke</string>
-    <string name="at_deadline">Ved tidsfrist</string>
-    <string name="at_deadline_or_overdue">Ved tidsfrist eller forfall</string>
     <string name="no_reminders">Ingen påminnelser</string>
     <string name="default_location_reminder_on_arrival">Ved ankomst</string>
     <string name="default_location_reminder_on_departure">Ved avgang</string>

app/src/main/res/values-nl/strings.xml

@@ -91,8 +91,6 @@
     <string name="priority_low">Laag</string>
     <string name="day_after_tomorrow">Overmorgen</string>
     <string name="next_week">Volgende week</string>
-    <string name="at_deadline">Op de einddatum</string>
-    <string name="at_deadline_or_overdue">Op of na de einddatum</string>
     <string name="no_reminders">Geen herinneringen</string>
     <string name="default_location_reminder_on_arrival">Bij aankomst</string>
     <string name="default_location_reminder_on_departure">Bij vertrek</string>

app/src/main/res/values-pl/strings.xml

@@ -92,8 +92,6 @@
     <string name="priority_low">Mało ważne</string>
     <string name="day_after_tomorrow">Pojutrze</string>
     <string name="next_week">Przyszły tydzień</string>
-    <string name="at_deadline">W dniu terminu nieprzekraczalnego</string>
-    <string name="at_deadline_or_overdue">W nieprzekraczalnym terminie lub gdy zaległe</string>
     <string name="no_reminders">Brak przypomnień</string>
     <string name="default_location_reminder_on_arrival">Po przybyciu</string>
     <string name="default_location_reminder_on_departure">Przy wyruszaniu</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -93,8 +93,6 @@
     <string name="priority_low">Baixa</string>
     <string name="day_after_tomorrow">Depois de amanhã</string>
     <string name="next_week">Próxima semana</string>
-    <string name="at_deadline">No vencimento</string>
-    <string name="at_deadline_or_overdue">No prazo ou vencidas</string>
     <string name="no_reminders">Sem lembretes</string>
     <string name="default_location_reminder_on_arrival">Ao chegar</string>
     <string name="default_location_reminder_on_departure">Ao sair</string>

app/src/main/res/values-pt/strings.xml

@@ -90,8 +90,6 @@
     <string name="priority_low">Baixa</string>
     <string name="day_after_tomorrow">Depois de amanhã</string>
     <string name="next_week">Próxima semana</string>
-    <string name="at_deadline">Na data de fim</string>
-    <string name="at_deadline_or_overdue">Na data de fim ou ultrapassada</string>
     <string name="BFE_Active">Minhas tarefas</string>
     <string name="BFE_Recent">Alteradas recentemente</string>
     <string name="CFA_button_add">Adicionar critério</string>

app/src/main/res/values-ro/strings.xml

@@ -458,8 +458,6 @@
     <string name="BFE_Active">Sarcinile mele</string>
     <string name="default_location_reminder_on_arrival_or_departure">La sosire și la plecare</string>
     <string name="no_reminders">Fără reamintiri</string>
-    <string name="at_deadline_or_overdue">La termen sau cu întârziere</string>
-    <string name="at_deadline">La termen</string>
     <string name="next_week">Săptămâna viitoare</string>
     <string name="day_after_tomorrow">Poimâine</string>
     <string name="priority_low">Redus</string>

app/src/main/res/values-ru/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">Низкий</string>
     <string name="day_after_tomorrow">Послезавтра</string>
     <string name="next_week">Следующая неделя</string>
-    <string name="at_deadline">В срок</string>
-    <string name="at_deadline_or_overdue">Вовремя или просрочена</string>
     <string name="no_reminders">Без напоминаний</string>
     <string name="default_location_reminder_on_arrival">По прибытии</string>
     <string name="default_location_reminder_on_departure">Покинув место</string>

app/src/main/res/values-si/strings.xml

@@ -403,8 +403,6 @@
     <string name="BFE_Recent">මෑතකදී වෙනස් කරන ලදි</string>
     <string name="BFE_Active">මගේ කාර්යයන්</string>
     <string name="no_reminders">මතක් කිරීම් නොමැත</string>
-    <string name="at_deadline_or_overdue">නියමිත දිනට හෝ ඊට පසුව</string>
-    <string name="at_deadline">නියමිත දිනට</string>
     <string name="next_week">ලබන සතිය</string>
     <string name="day_after_tomorrow">අනිද්දා</string>
     <string name="priority_low">අවම</string>

app/src/main/res/values-sk/strings.xml

@@ -94,8 +94,6 @@
     <string name="priority_low">Nízka</string>
     <string name="day_after_tomorrow">Pozajtra</string>
     <string name="next_week">Nasledujúci týždeň</string>
-    <string name="at_deadline">V termíne</string>
-    <string name="at_deadline_or_overdue">V termíne alebo po termíne</string>
     <string name="no_reminders">Žiadne upozornenia</string>
     <string name="default_location_reminder_on_arrival">Pri príchode</string>
     <string name="default_location_reminder_on_departure">Pri odchode</string>

app/src/main/res/values-sl-rSI/strings.xml

@@ -75,8 +75,6 @@
     <string name="EPr_default_reminders_mode_title">Privzeti način zvonenja/vibriranja</string>
     <string name="day_after_tomorrow">Pojutrišnjem</string>
     <string name="next_week">Naslednji teden</string>
-    <string name="at_deadline">Ob dospelosti</string>
-    <string name="at_deadline_or_overdue">Ob dospelosti ali potem</string>
     <string name="BFE_Active">Moji Opravki</string>
     <string name="BFE_Recent">Nedavno spremenjeno</string>
     <string name="custom_filter_or">na dan</string>

app/src/main/res/values-sv/strings.xml

@@ -87,8 +87,6 @@
     <string name="priority_low">Låg</string>
     <string name="day_after_tomorrow">I övermorgon</string>
     <string name="next_week">Nästa vecka</string>
-    <string name="at_deadline">Vid förfallodagen</string>
-    <string name="at_deadline_or_overdue">Vid eller efter förfallodagen</string>
     <string name="BFE_Active">Mina Uppgifter</string>
     <string name="BFE_Recent">Nyligen ändrade</string>
     <string name="custom_filter_or">eller</string>

app/src/main/res/values-ta/strings.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="no_reminders">நினைவூட்டல்கள் இல்லை</string>
-    <string name="at_deadline_or_overdue">காலக்கெடு அல்லது தாமதமாக</string>
-    <string name="at_deadline">காலக்கெடுவில்</string>
     <string name="next_week">அடுத்த வாரம்</string>
     <string name="day_after_tomorrow">நாளை மறுநாள்</string>
     <string name="priority_low">குறைந்த</string>

app/src/main/res/values-th/strings.xml

@@ -564,8 +564,6 @@
     <string name="default_location_reminder_on_departure">เมื่อออกเดินทาง</string>
     <string name="default_location_reminder_on_arrival">เมื่อมาถึง</string>
     <string name="no_reminders">ไม่มีตัวเตือน</string>
-    <string name="at_deadline_or_overdue">เมื่อถึงกําหนดเวลาหรือพ้นกําหนด</string>
-    <string name="at_deadline">เมื่อถึงกําหนดเวลา</string>
     <string name="next_week">อาทิตย์หน้า</string>
     <string name="day_after_tomorrow">วันหลังจากวันพรุ่งนี้</string>
     <string name="priority_low">ต่ํา</string>

app/src/main/res/values-tr/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">Düşük</string>
     <string name="day_after_tomorrow">Yarından Sonra</string>
     <string name="next_week">Gelecek Hafta</string>
-    <string name="at_deadline">Son tarihte</string>
-    <string name="at_deadline_or_overdue">Son tarihte ya da geciktiğinde</string>
     <string name="no_reminders">Hatırlatma yok</string>
     <string name="default_location_reminder_on_arrival">Varışta</string>
     <string name="default_location_reminder_on_departure">Kalkışta</string>

app/src/main/res/values-uk/strings.xml

@@ -97,8 +97,6 @@
     <string name="priority_low">Низький</string>
     <string name="day_after_tomorrow">Післязавтра</string>
     <string name="next_week">Наступного тижня</string>
-    <string name="at_deadline">У дедлайн</string>
-    <string name="at_deadline_or_overdue">У дедлайн чи після построчення</string>
     <string name="no_reminders">Без нагадувань</string>
     <string name="default_location_reminder_on_arrival">Після прибуття</string>
     <string name="default_location_reminder_on_departure">Під час покиданні місця</string>

app/src/main/res/values-ur/strings.xml

@@ -68,8 +68,6 @@
     <string name="default_location_reminder_on_departure">روانگی پر</string>
     <string name="default_location_reminder_on_arrival">آمد پر</string>
     <string name="no_reminders">کوئی یاددہانی نہیں</string>
-    <string name="at_deadline_or_overdue">آخری تاریخ یا زائد المیعاد پر</string>
-    <string name="at_deadline">مقررہ تاریخ پر</string>
     <string name="next_week">اگلے ہفتے</string>
     <string name="day_after_tomorrow">پرسوں</string>
     <string name="priority_low">کم</string>

app/src/main/res/values-vi/strings.xml

@@ -654,8 +654,6 @@
     <string name="default_location_reminder_on_departure">Khi khởi hành</string>
     <string name="default_location_reminder_on_arrival">Khi đến</string>
     <string name="no_reminders">Không có lời nhắc</string>
-    <string name="at_deadline_or_overdue">Tại hạn chót hoặc quá hạn</string>
-    <string name="at_deadline">Tại hạn chót</string>
     <string name="preferences_advanced">Nâng cao</string>
     <string name="preferences_look_and_feel">Ngoại hình</string>
     <string name="etesync_encryption_description">Hãy nhớ mật khẩu mã hoá mà bạn chọn, nó không thể được phục hồi!</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -89,8 +89,6 @@
     <string name="priority_low">低</string>
     <string name="day_after_tomorrow">后天</string>
     <string name="next_week">下周</string>
-    <string name="at_deadline">截止期限时</string>
-    <string name="at_deadline_or_overdue">截止期限或过期时</string>
     <string name="BFE_Active">我的任务</string>
     <string name="BFE_Recent">最近修改过的</string>
     <string name="CFA_button_add">添加条件</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -76,8 +76,6 @@
     <string name="priority_low">低</string>
     <string name="day_after_tomorrow">後天</string>
     <string name="next_week">下週</string>
-    <string name="at_deadline">在截止期限時</string>
-    <string name="at_deadline_or_overdue">在截止期限或過期時</string>
     <string name="BFE_Active">我的工作</string>
     <string name="BFE_Recent">最近修改過</string>
     <string name="CFA_button_add">加入條件</string>

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

@@ -92,10 +92,9 @@
   </string-array>
 
   <string-array name="EPr_default_reminders">
-    <item>@string/no_reminders</item>
-    <item>@string/at_deadline</item>
+    <item>@string/when_started</item>
+    <item>@string/when_due</item>
     <item>@string/when_overdue</item>
-    <item>@string/at_deadline_or_overdue</item>
   </string-array>
 
   <string-array name="CFC_dueBefore_entries">

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

@@ -202,10 +202,14 @@
 
   <string-array name="EPr_default_reminders_values">
     <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
-    <item>0</item>
-    <item>2</item>
-    <item>4</item>
-    <item>6</item>
+    <item>5</item> <!-- when started -->
+    <item>1</item> <!-- when due -->
+    <item>2</item> <!-- when overdue -->
+  </string-array>
+
+  <string-array name="EPr_default_reminders_default">
+    <item>1</item> <!-- when due -->
+    <item>2</item> <!-- when overdue -->
   </string-array>
 
   <string-array name="EPr_default_reminders_mode_values">
@@ -222,7 +226,7 @@
   <string name="p_default_hideUntil_key">p_def_hide</string>
 
   <!-- default reminders setting (corresponds to reminder flags) -->
-  <string name="p_default_reminders_key">p_def_reminders</string>
+  <string name="p_default_reminders_key">p_def_reminders_v2</string>
   <string name="p_default_location_reminder_key">p_def_location_reminders</string>
   <string name="p_default_location_radius">p_def_location_radius</string>
 

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

@@ -115,8 +115,6 @@ File %1$s contained %2$s.\n\n
   <string name="priority_low">Low</string>
   <string name="day_after_tomorrow">Day after tomorrow</string>
   <string name="next_week">Next week</string>
-  <string name="at_deadline">At deadline</string>
-  <string name="at_deadline_or_overdue">At deadline or overdue</string>
   <string name="no_reminders">No reminders</string>
   <string name="default_location_reminder_on_arrival">On arrival</string>
   <string name="default_location_reminder_on_departure">On departure</string>

app/src/main/res/xml/preferences_task_defaults.xml

@@ -68,13 +68,13 @@
     android:entryValues="@array/repeat_type_values"
     android:summary="%s" />
 
-  <ListPreference
-    android:defaultValue="6"
+  <MultiSelectListPreference
     android:entries="@array/EPr_default_reminders"
     android:entryValues="@array/EPr_default_reminders_values"
     android:icon="@drawable/ic_outline_notifications_24px"
     android:key="@string/p_default_reminders_key"
     android:summary="%s"
+    android:defaultValue="@array/EPr_default_reminders_default"
     android:title="@string/EPr_default_reminders_title"
     app:allowDividerAbove="true" />