TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-24 23:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ExpiryMode non-null in config

Browse Source
This commit is contained in:
andrew 2023-08-24 00:32:24 +09:30
parent 58b5815a09
commit 0ed9731622
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -1750,21 +1750,16 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
val userGroups = configFactory.userGroups ?: return val userGroups = configFactory.userGroups ?: return
val groupPublicKey = GroupUtil.addressToGroupSessionId(recipient.address) val groupPublicKey = GroupUtil.addressToGroupSessionId(recipient.address)
val expiryMode = config.expiryMode val expiryMode = config.expiryMode
val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)?.let { info -> val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)
info.copy(disappearingTimer = when (expiryMode) { ?.copy(disappearingTimer = expiryMode.expirySeconds) ?: return
null, ExpiryMode.NONE -> 0
else -> expiryMode.expirySeconds
})
} ?: return
userGroups.set(groupInfo) userGroups.set(groupInfo)
} else if (recipient.isLocalNumber) { } else if (recipient.isLocalNumber) {
val user = configFactory.user ?: return val user = configFactory.user ?: return
user.setNtsExpiry(config.expiryMode ?: ExpiryMode.NONE) user.setNtsExpiry(config.expiryMode)
} else if (recipient.isContactRecipient) { } else if (recipient.isContactRecipient) {
val contacts = configFactory.contacts ?: return val contacts = configFactory.contacts ?: return
val expiry = config.expiryMode
val contact = contacts.get(recipient.address.serialize())?.copy( val contact = contacts.get(recipient.address.serialize())?.copy(
expiryMode = expiry ?: ExpiryMode.NONE expiryMode = config.expiryMode
) ?: return ) ?: return
contacts.set(contact) contacts.set(contact)
} }

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

@ -4,10 +4,10 @@ import network.loki.messenger.libsession_util.util.ExpiryMode
data class ExpirationConfiguration( data class ExpirationConfiguration(
val threadId: Long = -1, val threadId: Long = -1,
val expiryMode: ExpiryMode? = null, val expiryMode: ExpiryMode = ExpiryMode.NONE,
val updatedTimestampMs: Long = 0 val updatedTimestampMs: Long = 0
) { ) {
val isEnabled = expiryMode != null && expiryMode.expirySeconds > 0 val isEnabled = expiryMode.expirySeconds > 0
companion object { companion object {
val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */ val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */