From d473ff6e866f62af9d43585305ad7c83ca6a1e16 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 9 Jan 2025 16:40:26 -0500
Subject: [PATCH] Fix expirationTime for call links.

---
 .../backup/v2/exporters/CallLinkArchiveExporter.kt  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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