Fix ExpSettingsViewModel

2 years ago · 60f396a158
parent d6dd7a82f1
commit 60f396a158
1 changed files with 1 additions and 4 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
@ -58,10 +58,7 @@ class ExpirationSettingsViewModel(
    init {
        // SETUP
        viewModelScope.launch {
-            expirationConfig = storage.getExpirationConfiguration(threadId)?.let {
-                if (ExpirationConfiguration.isNewConfigEnabled) it
-                else if (it)
-            }
+            expirationConfig = storage.getExpirationConfiguration(threadId)
            val expirationType = expirationConfig?.expiryMode
            val recipient = threadDb.getRecipientForThreadId(threadId)
            _recipient.value = recipient