TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix debug time ordering

Browse Source
This commit is contained in:
andrew 2023-09-04 12:18:41 +09:30
parent f1d3518f1c
commit 2d89dda2dd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
View File

@ -290,15 +290,24 @@ private fun timeOptions(state: State) =
private val DEBUG_TIME = 1.minutes private val DEBUG_TIME = 1.minutes
val afterSendTimes = buildList { val defaultTimes = buildList {
if (BuildConfig.DEBUG) add(DEBUG_TIME)
add(12.hours) add(12.hours)
add(1.days) add(1.days)
add(7.days) add(7.days)
add(14.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( private fun timeOptionsOnly(state: State) = listOfNotNull(
typeOption(ExpiryType.NONE, state, R.string.arrays__off, enabled = state.isSelfAdmin), typeOption(ExpiryType.NONE, state, R.string.arrays__off, enabled = state.isSelfAdmin),