From 2d89dda2ddd1132a7aca76ebcf0468682992d875 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 4 Sep 2023 12:18:41 +0930 Subject: [PATCH] Fix debug time ordering --- .../expiration/ExpirationSettingsViewModel.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt index 157e50eb22..437d05a4ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt @@ -290,15 +290,24 @@ private fun timeOptions(state: State) = private val DEBUG_TIME = 1.minutes -val afterSendTimes = buildList { - if (BuildConfig.DEBUG) add(DEBUG_TIME) +val defaultTimes = buildList { add(12.hours) add(1.days) add(7.days) add(14.days) } -val afterReadTimes = listOf(5.minutes, 1.hours) + afterSendTimes +val afterSendTimes = buildList { + if (BuildConfig.DEBUG) add(DEBUG_TIME) + addAll(defaultTimes) +} + +val afterReadTimes = buildList { + if (BuildConfig.DEBUG) add(DEBUG_TIME) + add(5.minutes) + add(1.hours) + addAll(defaultTimes) +} private fun timeOptionsOnly(state: State) = listOfNotNull( typeOption(ExpiryType.NONE, state, R.string.arrays__off, enabled = state.isSelfAdmin),