From 626647ae1efd864de2ad92e7b954aaa9b1017c99 Mon Sep 17 00:00:00 2001
From: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
Date: Wed, 11 Mar 2026 11:15:58 -0400
Subject: [PATCH] Update storage proto and handle invalid callHistory messages

---
 protos/SignalStorage.proto              | 2 +-
 ts/services/backups/export.preload.ts   | 5 ++---
 ts/services/storageRecordOps.preload.ts | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/protos/SignalStorage.proto b/protos/SignalStorage.proto
index 45258729da..9f291f9d1f 100644
--- a/protos/SignalStorage.proto
+++ b/protos/SignalStorage.proto
@@ -294,7 +294,7 @@ message AccountRecord {
   reserved /*backupsSubscriberCurrencyCode*/ 37;
   reserved /*backupsSubscriptionManuallyCancelled*/ 38;
   // Set to true after backups are enabled and one is uploaded.
-  optional bool hasBackup = 39;
+  reserved /*hasBackup*/ 39;
   // See zkgroup for integer particular values. Unset if backups are not enabled.
   optional uint64 backupTier = 40;
   IAPSubscriberData backupSubscriberData = 41;
diff --git a/ts/services/backups/export.preload.ts b/ts/services/backups/export.preload.ts
index 8b2a8b427d..bd79df0371 100644
--- a/ts/services/backups/export.preload.ts
+++ b/ts/services/backups/export.preload.ts
@@ -1952,9 +1952,8 @@ export class BackupExportStream extends Readable {
       );
 
       if (!conversation) {
-        throw new Error(
-          `${logId}: callHistory message had unknown conversationId!`
-        );
+        log.error(`${logId}: callHistory message had unknown conversationId!`);
+        return { kind: NonBubbleResultKind.Drop };
       }
 
       const { callId } = message;
diff --git a/ts/services/storageRecordOps.preload.ts b/ts/services/storageRecordOps.preload.ts
index 59c02bd0f2..8648a067f6 100644
--- a/ts/services/storageRecordOps.preload.ts
+++ b/ts/services/storageRecordOps.preload.ts
@@ -566,8 +566,6 @@ export function toAccountRecord(
         ? donorSubscriptionManuallyCanceled
         : null,
 
-    // TODO: DESKTOP-9870
-    hasBackup: null,
     backupSubscriberData: generateBackupsSubscriberData(),
     backupTier: backupTier != null ? BigInt(backupTier) : null,