TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-22 10:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: disappearing viewmodel tests (#1432)

Browse Source
This commit is contained in:
0x330a 2024-03-13 11:31:08 +11:00 committed by GitHub
parent 7bcf823740
commit 3dee7ec6bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt
View File

@ -53,6 +53,7 @@ class DisappearingMessagesViewModelTest {
@Mock lateinit var application: Application @Mock lateinit var application: Application
@Mock lateinit var textSecurePreferences: TextSecurePreferences @Mock lateinit var textSecurePreferences: TextSecurePreferences
@Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol @Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol
@Mock lateinit var disappearingMessages: DisappearingMessages
@Mock lateinit var threadDb: ThreadDatabase @Mock lateinit var threadDb: ThreadDatabase
@Mock lateinit var groupDb: GroupDatabase @Mock lateinit var groupDb: GroupDatabase
@Mock lateinit var storage: Storage @Mock lateinit var storage: Storage
@ -114,9 +115,9 @@ class DisappearingMessagesViewModelTest {
isSelfAdmin = true, isSelfAdmin = true,
address = LOCAL_ADDRESS, address = LOCAL_ADDRESS,
isNoteToSelf = true, isNoteToSelf = true,
expiryMode = ExpiryMode.NONE, expiryMode = ExpiryMode.Legacy(0),
isNewConfigEnabled = false, isNewConfigEnabled = false,
persistedMode = ExpiryMode.NONE, persistedMode = ExpiryMode.Legacy(0),
showDebugOptions = false showDebugOptions = false
) )
) )
@ -127,7 +128,7 @@ class DisappearingMessagesViewModelTest {
UiState( UiState(
OptionsCard( OptionsCard(
R.string.activity_disappearing_messages_timer, R.string.activity_disappearing_messages_timer,
typeOption(ExpiryMode.NONE, selected = true), typeOption(ExpiryMode.NONE, selected = false),
timeOption(ExpiryType.LEGACY, 12.hours), timeOption(ExpiryType.LEGACY, 12.hours),
timeOption(ExpiryType.LEGACY, 1.days), timeOption(ExpiryType.LEGACY, 1.days),
timeOption(ExpiryType.LEGACY, 7.days), timeOption(ExpiryType.LEGACY, 7.days),
@ -555,6 +556,7 @@ class DisappearingMessagesViewModelTest {
application, application,
textSecurePreferences, textSecurePreferences,
messageExpirationManager, messageExpirationManager,
disappearingMessages,
threadDb, threadDb,
groupDb, groupDb,
storage, storage,

3
libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
View File

@ -1,7 +1,6 @@
package org.session.libsession.messaging.messages package org.session.libsession.messaging.messages
import network.loki.messenger.libsession_util.util.ExpiryMode import network.loki.messenger.libsession_util.util.ExpiryMode
import org.session.libsession.snode.SnodeAPI
data class ExpirationConfiguration( data class ExpirationConfiguration(
val threadId: Long = -1, val threadId: Long = -1,
@ -11,7 +10,7 @@ data class ExpirationConfiguration(
val isEnabled = expiryMode.expirySeconds > 0 val isEnabled = expiryMode.expirySeconds > 0
companion object { companion object {
val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 1710284400000 val isNewConfigEnabled = true
} }
} }