oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Respect option selected in note to self

This commit is contained in:
andrew 2023-08-27 01:24:41 +09:30
parent 6602f1bd14
commit 97f28fd2e5
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,19 +86,19 @@ class ExpirationSettingsViewModel(
private fun typeOption( private fun typeOption(
type: ExpiryType, type: ExpiryType,
selected: ExpiryType?, state: State,
@StringRes title: Int, @StringRes title: Int,
@StringRes subtitle: Int? = null, @StringRes subtitle: Int? = null,
@StringRes contentDescription: Int = title @StringRes contentDescription: Int = title
) = OptionModel(GetString(title), subtitle?.let(::GetString), selected = selected == type) { setType(type) } ) = OptionModel(GetString(title), subtitle?.let(::GetString), selected = state.expiryType == type) { setType(type) }
private fun typeOptions(state: State) = private fun typeOptions(state: State) =
if (state.isSelf) emptyList() if (state.isSelf) emptyList()
else listOf( else listOf(
typeOption(ExpiryType.NONE, state.expiryType, R.string.expiration_off, contentDescription = R.string.AccessibilityId_disable_disappearing_messages), typeOption(ExpiryType.NONE, state, R.string.expiration_off, contentDescription = R.string.AccessibilityId_disable_disappearing_messages),
typeOption(ExpiryType.LEGACY, state.expiryType, R.string.expiration_type_disappear_legacy, contentDescription = R.string.expiration_type_disappear_legacy_description), typeOption(ExpiryType.LEGACY, state, R.string.expiration_type_disappear_legacy, contentDescription = R.string.expiration_type_disappear_legacy_description),
typeOption(ExpiryType.AFTER_READ, state.expiryType, R.string.expiration_type_disappear_after_read, contentDescription = R.string.expiration_type_disappear_after_read_description), typeOption(ExpiryType.AFTER_READ, state, R.string.expiration_type_disappear_after_read, contentDescription = R.string.expiration_type_disappear_after_read_description),
typeOption(ExpiryType.AFTER_SEND, state.expiryType, R.string.expiration_type_disappear_after_send, contentDescription = R.string.expiration_type_disappear_after_send_description), typeOption(ExpiryType.AFTER_SEND, state, R.string.expiration_type_disappear_after_send, contentDescription = R.string.expiration_type_disappear_after_send_description),
) )
private fun setType(type: ExpiryType) { private fun setType(type: ExpiryType) {
@ -122,7 +122,7 @@ class ExpirationSettingsViewModel(
// private fun timeOptions(state: State) = timeOptions(state.types.isEmpty(), state.expiryType == ExpiryType.AFTER_SEND) // private fun timeOptions(state: State) = timeOptions(state.types.isEmpty(), state.expiryType == ExpiryType.AFTER_SEND)
private fun timeOptions(state: State): List<OptionModel> = private fun timeOptions(state: State): List<OptionModel> =
if (state.isSelf) noteToSelfOptions(state.expiryType) if (state.isSelf) noteToSelfOptions(state)
else when (state.expiryMode) { else when (state.expiryMode) {
is ExpiryMode.Legacy -> afterReadTimes is ExpiryMode.Legacy -> afterReadTimes
is ExpiryMode.AfterRead -> afterReadTimes is ExpiryMode.AfterRead -> afterReadTimes
@ -133,10 +133,10 @@ class ExpirationSettingsViewModel(
private val afterReadTimes = listOf(12.hours, 1.days, 7.days, 14.days) private val afterReadTimes = listOf(12.hours, 1.days, 7.days, 14.days)
private val afterSendTimes = listOf(5.minutes, 1.hours) + afterReadTimes private val afterSendTimes = listOf(5.minutes, 1.hours) + afterReadTimes
private fun noteToSelfOptions(selected: ExpiryType?) = listOfNotNull( private fun noteToSelfOptions(state: State) = listOfNotNull(
typeOption(ExpiryType.NONE, selected, R.string.arrays__off), typeOption(ExpiryType.NONE, state, R.string.arrays__off),
noteToSelfOption(1.minutes, subtitle = "for testing purposes").takeIf { BuildConfig.DEBUG }, noteToSelfOption(1.minutes, state, subtitle = "for testing purposes").takeIf { BuildConfig.DEBUG },
) + afterSendTimes.map(::noteToSelfOption) ) + afterSendTimes.map { noteToSelfOption(it, state) }
private fun option( private fun option(
duration: Duration, duration: Duration,
@ -147,12 +147,13 @@ class ExpirationSettingsViewModel(
) )
private fun noteToSelfOption( private fun noteToSelfOption(
duration: Duration, duration: Duration,
state: State,
title: GetString = GetString { ExpirationUtil.getExpirationDisplayValue(it, duration.inWholeSeconds.toInt()) }, title: GetString = GetString { ExpirationUtil.getExpirationDisplayValue(it, duration.inWholeSeconds.toInt()) },
subtitle: String? = null subtitle: String? = null
) = OptionModel( ) = OptionModel(
title = title, title = title,
subtitle = subtitle?.let(::GetString), subtitle = subtitle?.let(::GetString),
selected = false, selected = state.duration == duration,
onClick = { setMode(ExpiryMode.AfterSend(duration.inWholeSeconds)) } onClick = { setMode(ExpiryMode.AfterSend(duration.inWholeSeconds)) }
) )
@ -219,6 +220,7 @@ data class State(
val expiryMode: ExpiryMode? = null, val expiryMode: ExpiryMode? = null,
val types: List<ExpiryType> = emptyList() val types: List<ExpiryType> = emptyList()
) { ) {
val duration get() = expiryMode?.duration
val isSelf = recipient?.isLocalNumber == true val isSelf = recipient?.isLocalNumber == true
val expiryType get() = expiryMode?.type val expiryType get() = expiryMode?.type
} }

6
libsession-util/src/main/java/network/loki/messenger/libsession_util/util/ExpiryMode.kt
View File

@ -1,8 +1,12 @@
package network.loki.messenger.libsession_util.util package network.loki.messenger.libsession_util.util
import kotlin.time.Duration.Companion.seconds
sealed class ExpiryMode(val expirySeconds: Long) { sealed class ExpiryMode(val expirySeconds: Long) {
object NONE: ExpiryMode(0) object NONE: ExpiryMode(0)
class Legacy(seconds: Long): ExpiryMode(seconds) // after read class Legacy(seconds: Long): ExpiryMode(seconds) // after read
class AfterSend(seconds: Long): ExpiryMode(seconds) class AfterSend(seconds: Long): ExpiryMode(seconds)
class AfterRead(seconds: Long): ExpiryMode(seconds) class AfterRead(seconds: Long): ExpiryMode(seconds)
}
val duration get() = expirySeconds.seconds
}