TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 22:53:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix read/write legacy

Browse Source
This commit is contained in:
andrew 2023-11-15 12:03:23 +10:30
parent 725ad43b1d
commit 4ed5b57abd
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import org.session.libsession.messaging.jobs.MessageSendJob
import org.session.libsession.messaging.jobs.RetrieveProfileAvatarJob import org.session.libsession.messaging.jobs.RetrieveProfileAvatarJob
import org.session.libsession.messaging.messages.Destination import org.session.libsession.messaging.messages.Destination
import org.session.libsession.messaging.messages.ExpirationConfiguration import org.session.libsession.messaging.messages.ExpirationConfiguration
import org.session.libsession.messaging.messages.ExpirationConfiguration.Companion.isNewConfigEnabled
import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.Message
import org.session.libsession.messaging.messages.control.ConfigurationMessage import org.session.libsession.messaging.messages.control.ConfigurationMessage
import org.session.libsession.messaging.messages.control.MessageRequestResponse import org.session.libsession.messaging.messages.control.MessageRequestResponse
@ -1717,7 +1718,9 @@ open class Storage(
?.run { disappearingTimer.takeIf { it != 0L }?.let(ExpiryMode::AfterSend) ?: ExpiryMode.NONE } ?.run { disappearingTimer.takeIf { it != 0L }?.let(ExpiryMode::AfterSend) ?: ExpiryMode.NONE }
} }
else -> null else -> null
}?.let { ExpirationConfiguration(threadId, it, dbExpirationMetadata.updatedTimestampMs) } }
?.run { takeIf { isNewConfigEnabled || it is ExpiryMode.NONE } ?: ExpiryMode.Legacy(expirySeconds) }
?.let { ExpirationConfiguration(threadId, it, dbExpirationMetadata.updatedTimestampMs) }
} }
override fun setExpirationConfiguration(config: ExpirationConfiguration) { override fun setExpirationConfiguration(config: ExpirationConfiguration) {
@ -1727,24 +1730,32 @@ open class Storage(
val currentConfig = expirationDb.getExpirationConfiguration(config.threadId) val currentConfig = expirationDb.getExpirationConfiguration(config.threadId)
if (currentConfig != null && currentConfig.updatedTimestampMs >= config.updatedTimestampMs) return if (currentConfig != null && currentConfig.updatedTimestampMs >= config.updatedTimestampMs) return
val expiryMode = config.expiryMode.run {
takeUnless { it is ExpiryMode.Legacy }
?: if (recipient.isContactRecipient) ExpiryMode.AfterRead(expirySeconds)
else ExpiryMode.AfterSend(expirySeconds)
}
if (recipient.isClosedGroupRecipient) { if (recipient.isClosedGroupRecipient) {
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 groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey) val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)
?.copy(disappearingTimer = expiryMode.expirySeconds) ?: return ?.copy(disappearingTimer = 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) user.setNtsExpiry(expiryMode)
} else if (recipient.isContactRecipient) { } else if (recipient.isContactRecipient) {
val contacts = configFactory.contacts ?: return val contacts = configFactory.contacts ?: return
val contact = contacts.get(recipient.address.serialize())?.copy( val contact = contacts.get(recipient.address.serialize())?.copy(
expiryMode = config.expiryMode expiryMode = expiryMode
) ?: return ) ?: return
contacts.set(contact) contacts.set(contact)
} }
expirationDb.setExpirationConfiguration(config) expirationDb.setExpirationConfiguration(
config.run { copy(expiryMode = expiryMode) }
)
} }
override fun getExpiringMessages(messageIds: List<Long>): List<Pair<Long, Long>> { override fun getExpiringMessages(messageIds: List<Long>): List<Pair<Long, Long>> {