empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix expirationTime for call links.

Browse source
This commit is contained in:
Greyson Parrelli 2025-01-09 16:40:26 -05:00
parent 7611b2421d
commit d473ff6e86
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/CallLinkArchiveExporter.kt
View file

@ -10,6 +10,7 @@ import okio.ByteString.Companion.toByteString
import org.signal.ringrtc.CallLinkState import org.signal.ringrtc.CallLinkState
import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient
import org.thoughtcrime.securesms.backup.v2.proto.CallLink import org.thoughtcrime.securesms.backup.v2.proto.CallLink
import org.thoughtcrime.securesms.backup.v2.util.clampToValidBackupRange
import org.thoughtcrime.securesms.database.CallLinkTable import org.thoughtcrime.securesms.database.CallLinkTable
import java.io.Closeable import java.io.Closeable
@ -28,17 +29,19 @@ class CallLinkArchiveExporter(private val cursor: Cursor) : Iterator<ArchiveReci
} }
val callLink = CallLinkTable.CallLinkDeserializer.deserialize(cursor) val callLink = CallLinkTable.CallLinkDeserializer.deserialize(cursor)
val expirationTime = try {
callLink.state.expiration.toEpochMilli()
} catch (e: ArithmeticException) {
Long.MAX_VALUE
}
return ArchiveRecipient( return ArchiveRecipient(
id = callLink.recipientId.toLong(), id = callLink.recipientId.toLong(),
callLink = CallLink( callLink = CallLink(
rootKey = callLink.credentials!!.linkKeyBytes.toByteString(), rootKey = callLink.credentials!!.linkKeyBytes.toByteString(),
adminKey = callLink.credentials.adminPassBytes?.toByteString(), adminKey = callLink.credentials.adminPassBytes?.toByteString(),
name = callLink.state.name, name = callLink.state.name,
expirationMs = try { expirationMs = expirationTime.takeIf { it != Long.MAX_VALUE }?.clampToValidBackupRange() ?: 0,
callLink.state.expiration.toEpochMilli()
} catch (e: ArithmeticException) {
Long.MAX_VALUE
},
restrictions = callLink.state.restrictions.toRemote() restrictions = callLink.state.restrictions.toRemote()
) )
) )