diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt b/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt index a40d67a5a6..22679f311e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt @@ -53,6 +53,7 @@ class DisappearingMessagesViewModelTest { @Mock lateinit var application: Application @Mock lateinit var textSecurePreferences: TextSecurePreferences @Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol + @Mock lateinit var disappearingMessages: DisappearingMessages @Mock lateinit var threadDb: ThreadDatabase @Mock lateinit var groupDb: GroupDatabase @Mock lateinit var storage: Storage @@ -114,9 +115,9 @@ class DisappearingMessagesViewModelTest { isSelfAdmin = true, address = LOCAL_ADDRESS, isNoteToSelf = true, - expiryMode = ExpiryMode.NONE, + expiryMode = ExpiryMode.Legacy(0), isNewConfigEnabled = false, - persistedMode = ExpiryMode.NONE, + persistedMode = ExpiryMode.Legacy(0), showDebugOptions = false ) ) @@ -127,7 +128,7 @@ class DisappearingMessagesViewModelTest { UiState( OptionsCard( R.string.activity_disappearing_messages_timer, - typeOption(ExpiryMode.NONE, selected = true), + typeOption(ExpiryMode.NONE, selected = false), timeOption(ExpiryType.LEGACY, 12.hours), timeOption(ExpiryType.LEGACY, 1.days), timeOption(ExpiryType.LEGACY, 7.days), @@ -555,6 +556,7 @@ class DisappearingMessagesViewModelTest { application, textSecurePreferences, messageExpirationManager, + disappearingMessages, threadDb, groupDb, storage, diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt index cc33379466..8e3ab18b22 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt @@ -1,7 +1,6 @@ package org.session.libsession.messaging.messages import network.loki.messenger.libsession_util.util.ExpiryMode -import org.session.libsession.snode.SnodeAPI data class ExpirationConfiguration( val threadId: Long = -1, @@ -11,7 +10,7 @@ data class ExpirationConfiguration( val isEnabled = expiryMode.expirySeconds > 0 companion object { - val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 1710284400000 + val isNewConfigEnabled = true } }