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

fix: error with legacy type and set type check

This commit is contained in:
0x330a 2023-08-16 16:25:25 +10:00
parent 9faa400a5b
commit d6dd7a82f1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,10 @@ class ExpirationSettingsViewModel(
init { init {
// SETUP // SETUP
viewModelScope.launch { viewModelScope.launch {
expirationConfig = storage.getExpirationConfiguration(threadId) expirationConfig = storage.getExpirationConfiguration(threadId)?.let {
if (ExpirationConfiguration.isNewConfigEnabled) it
else if (it)
}
val expirationType = expirationConfig?.expiryMode val expirationType = expirationConfig?.expiryMode
val recipient = threadDb.getRecipientForThreadId(threadId) val recipient = threadDb.getRecipientForThreadId(threadId)
_recipient.value = recipient _recipient.value = recipient
@ -121,8 +124,12 @@ class ExpirationSettingsViewModel(
fun onSetClick() = viewModelScope.launch { fun onSetClick() = viewModelScope.launch {
val expiryMode = _selectedExpirationTimer.value?.value ?: ExpiryMode.NONE val expiryMode = _selectedExpirationTimer.value?.value ?: ExpiryMode.NONE
val typeValue = expiryMode.let {
if (it is ExpiryMode.Legacy) ExpiryMode.AfterRead(it.expirySeconds)
else it
}
val address = recipient.value?.address val address = recipient.value?.address
if (address == null || (expirationConfig?.expiryMode != expiryMode)) { if (address == null || (expirationConfig?.expiryMode == typeValue)) {
_uiState.update { _uiState.update {
it.copy(settingsSaved = false) it.copy(settingsSaved = false)
} }
@ -130,13 +137,13 @@ class ExpirationSettingsViewModel(
} }
val expiryChangeTimestampMs = SnodeAPI.nowWithOffset val expiryChangeTimestampMs = SnodeAPI.nowWithOffset
storage.setExpirationConfiguration(ExpirationConfiguration(threadId, expiryMode, expiryChangeTimestampMs)) storage.setExpirationConfiguration(ExpirationConfiguration(threadId, typeValue, expiryChangeTimestampMs))
val message = ExpirationTimerUpdate(expiryMode.expirySeconds.toInt()) val message = ExpirationTimerUpdate(typeValue.expirySeconds.toInt())
message.sender = textSecurePreferences.getLocalNumber() message.sender = textSecurePreferences.getLocalNumber()
message.recipient = address.serialize() message.recipient = address.serialize()
message.sentTimestamp = expiryChangeTimestampMs message.sentTimestamp = expiryChangeTimestampMs
messageExpirationManager.setExpirationTimer(message, expiryMode) messageExpirationManager.setExpirationTimer(message, typeValue)
MessageSender.send(message, address) MessageSender.send(message, address)
_uiState.update { _uiState.update {