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 7071c84e0e..85c440cdcb 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 @@ -66,8 +66,12 @@ class ExpirationSettingsViewModel( ExpirationType.DELETE_AFTER_READ -> afterReadOptions else -> emptyList() } - }.onEach { - _expirationTimerOptions.value = it + }.onEach { options -> + _expirationTimerOptions.value = if (recipient.value?.isLocalNumber == true || recipient.value?.isClosedGroupRecipient == true) { + options + } else { + options.slice(1 until options.size) + } }.launchIn(viewModelScope) }