TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 20:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use the shared config expiry mode types instead of custom protobufs so we can remove a variable and simplify checks across two variables

Browse Source
This commit is contained in:
0x330a
2023-07-28 11:39:12 +10:00
parent 7f4db64a5a
commit 19083e2ce7
4 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,13 @@
package org.session.libsession.messaging.messages
import org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType
import network.loki.messenger.libsession_util.util.ExpiryMode
data class ExpirationConfiguration(
val threadId: Long = -1,
val durationSeconds: Int = 0,
val expirationType: ExpirationType? = null,
val expirationType: ExpiryMode? = null,
val updatedTimestampMs: Long = 0
) {
val isEnabled = durationSeconds > 0 && expirationType != null
val isEnabled = expirationType != null && expirationType.expirySeconds > 0
companion object {
val isNewConfigEnabled = false /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */
@@ -16,7 +15,7 @@ data class ExpirationConfiguration(
}
}
data class ExpirationDatabaseConfiguration(
data class ExpirationDatabaseMetadata(
val threadId: Long = -1,
val updatedTimestampMs: Long
)