From 3184368fa7112c170a486e69d3fd0134c3aebd4a Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Wed, 17 Jul 2024 12:11:37 -0400
Subject: [PATCH] Various backup/restore bug fixes.

---
 .../v2/database/CallLinkTableBackupExtensions.kt   | 14 +++++++++++---
 .../backup/v2/database/ChatItemImportInserter.kt   |  2 ++
 .../database/model/GroupCallUpdateDetailsUtil.java |  2 +-
 .../registration/ui/RegistrationViewModel.kt       |  9 ---------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
index 1b506d03d7..0c2a3fc033 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
@@ -31,11 +31,17 @@ fun CallLinkTable.getCallLinksForBackup(): BackupCallLinkIterator {
   return BackupCallLinkIterator(cursor)
 }
 
-fun CallLinkTable.restoreFromBackup(callLink: CallLink): RecipientId {
+fun CallLinkTable.restoreFromBackup(callLink: CallLink): RecipientId? {
+  val rootKey: CallLinkRootKey
+  try {
+    rootKey = CallLinkRootKey(callLink.rootKey.toByteArray())
+  } catch (e: Exception) {
+    return null
+  }
   return SignalDatabase.callLinks.insertCallLink(
     CallLinkTable.CallLink(
       recipientId = RecipientId.UNKNOWN,
-      roomId = CallLinkRoomId.fromCallLinkRootKey(CallLinkRootKey(callLink.rootKey.toByteArray())),
+      roomId = CallLinkRoomId.fromCallLinkRootKey(rootKey),
       credentials = CallLinkCredentials(callLink.rootKey.toByteArray(), callLink.adminKey?.toByteArray()),
       state = SignalCallLinkState(
         name = callLink.name,
@@ -67,7 +73,9 @@ class BackupCallLinkIterator(private val cursor: Cursor) : Iterator<BackupRecipi
         rootKey = callLink.credentials?.linkKeyBytes?.toByteString() ?: ByteString.EMPTY,
         adminKey = callLink.credentials?.adminPassBytes?.toByteString(),
         name = callLink.state.name,
-        expirationMs = callLink.state.expiration.toEpochMilli(),
+        expirationMs = try {
+          callLink.state.expiration.toEpochMilli()
+        } catch (e: ArithmeticException) { Long.MAX_VALUE },
         restrictions = callLink.state.restrictions.toBackup()
       )
     )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
index e1b3f8c314..055f4f3b8d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
@@ -180,6 +180,8 @@ class ChatItemImportInserter(
     }
     val messageInsert = chatItem.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId)
     if (chatItem.revisions.isNotEmpty()) {
+      // Flush to avoid having revisions cross batch boundaries, which will cause a foreign key failure
+      flush()
       val originalId = messageId
       val latestRevisionId = originalId + chatItem.revisions.size
       val sortedRevisions = chatItem.revisions.sortedBy { it.dateSent }.map { it.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
index dfae412e4b..09d1e7342b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
@@ -32,7 +32,7 @@ public final class GroupCallUpdateDetailsUtil {
    */
   public static @NonNull String createBodyFromBackup(@NonNull GroupCall groupCallChatUpdate, ServiceId.ACI startedCallAci) {
     GroupCallUpdateDetails details = new GroupCallUpdateDetails.Builder()
-        .startedCallUuid(Objects.toString(startedCallAci, null))
+        .startedCallUuid(Objects.toString(startedCallAci, ""))
         .startedCallTimestamp(groupCallChatUpdate.startedCallTimestamp)
         .endedCallTimestamp(groupCallChatUpdate.endedCallTimestamp)
         .isCallFull(false)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
index dd1283f824..a7a0624d39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.withContext
 import org.signal.core.util.Stopwatch
 import org.signal.core.util.isNotNullOrBlank
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob
@@ -772,8 +771,6 @@ class RegistrationViewModel : ViewModel() {
     Log.v(TAG, "onSuccessfulRegistration()")
     RegistrationRepository.registerAccountLocally(context, registrationData, remoteResult, reglockEnabled)
 
-    restoreBackupTier()
-
     if (reglockEnabled) {
       SignalStore.onboarding.clearAll()
       val stopwatch = Stopwatch("RegistrationLockRestore")
@@ -864,12 +861,6 @@ class RegistrationViewModel : ViewModel() {
   companion object {
     private val TAG = Log.tag(RegistrationViewModel::class.java)
 
-    private suspend fun restoreBackupTier() = withContext(Dispatchers.IO) {
-      val startTime = System.currentTimeMillis()
-      BackupRepository.restoreBackupTier()
-      Log.i(TAG, "Took " + (System.currentTimeMillis() - startTime) + " ms to restore the backup tier..")
-    }
-
     private suspend fun refreshRemoteConfig() = withContext(Dispatchers.IO) {
       val startTime = System.currentTimeMillis()
       try {