TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
andrew 2023-08-31 12:45:35 +09:30
parent bc83c3da52
commit 88223be957
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt
View File

@ -97,10 +97,13 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() {
lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.event.collect {
if (it.saveSuccess) {
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ExpirationSettingsActivity)
finish()
} else showToast(getString(R.string.ExpirationSettingsActivity_settings_not_updated))
when (it) {
Event.SUCCESS -> {
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ExpirationSettingsActivity)
finish()
}
Event.FAIL -> showToast(getString(R.string.ExpirationSettingsActivity_settings_not_updated))
}
}
}
}

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

@ -34,9 +34,9 @@ import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
data class Event(
val saveSuccess: Boolean
)
enum class Event {
SUCCESS, FAIL
}
data class State(
val isGroup: Boolean = false,
@ -125,28 +125,29 @@ class ExpirationSettingsViewModel(
override fun onSetClick() = viewModelScope.launch {
val state = _state.value
val expiryMode = state.expiryMode ?: ExpiryMode.NONE
val typeValue = expiryMode.let {
val mode = (state.expiryMode ?: ExpiryMode.NONE).let {
if (it is ExpiryMode.Legacy) ExpiryMode.AfterRead(it.expirySeconds)
else it
}
val address = state.address
if (address == null || expirationConfig?.expiryMode == typeValue) {
_event.send(Event(false))
if (address == null || expirationConfig?.expiryMode == mode) {
_event.send(Event.FAIL)
return@launch
}
val expiryChangeTimestampMs = SnodeAPI.nowWithOffset
storage.setExpirationConfiguration(ExpirationConfiguration(threadId, typeValue, expiryChangeTimestampMs))
storage.setExpirationConfiguration(ExpirationConfiguration(threadId, mode, expiryChangeTimestampMs))
val message = ExpirationTimerUpdate(typeValue.expirySeconds.toInt())
message.sender = textSecurePreferences.getLocalNumber()
message.recipient = address.serialize()
message.sentTimestamp = expiryChangeTimestampMs
messageExpirationManager.setExpirationTimer(message, typeValue)
ExpirationTimerUpdate(mode.expirySeconds.toInt()).apply {
sender = textSecurePreferences.getLocalNumber()
recipient = address.serialize()
sentTimestamp = expiryChangeTimestampMs
}.also { message ->
messageExpirationManager.setExpirationTimer(message, mode)
MessageSender.send(message, address)
}
MessageSender.send(message, address)
_event.send(Event(true))
_event.send(Event.SUCCESS)
}
@dagger.assisted.AssistedFactory