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

fix: legacy message deletions working better now

Browse Source
This commit is contained in:
0x330a
2023-01-11 17:25:38 +11:00
parent b6a4fb9024
commit 2048e08c86
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,10 +8,10 @@ class ExpirationConfiguration(
val expirationTypeValue: Int = -1,
val updatedTimestampMs: Long = 0
) {
val isEnabled = durationSeconds > 0
val expirationType: ExpirationType? = ExpirationType.valueOf(expirationTypeValue)
val isEnabled = durationSeconds > 0 && expirationType != null
companion object {
val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */
val isNewConfigEnabled = false /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */
}
}

4
libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
View File

@@ -45,9 +45,9 @@ abstract class Message {
expirationTimer = 0
return
}
expirationTimer = config.durationSeconds
lastDisappearingMessageChangeTimestamp = config.updatedTimestampMs
if (config.isEnabled) {
expirationTimer = config.durationSeconds
lastDisappearingMessageChangeTimestamp = config.updatedTimestampMs
expirationType = config.expirationType
}
}