From bcaca1ebd5f1c80d9c9276c8ebd061f21b6101e2 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 18 May 2021 13:27:16 -0700
Subject: [PATCH] View Once: Allow for missing sender; only require senderUuid

---
 ts/models/messages.ts        | 5 -----
 ts/textsecure.d.ts           | 6 +++---
 ts/textsecure/SendMessage.ts | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index a9304c6065..30e04258fc 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -1801,11 +1801,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
 
     if (!fromSync) {
       const sender = this.getSource();
-
-      if (sender === undefined) {
-        throw new Error('sender is undefined');
-      }
-
       const senderUuid = this.getSourceUuid();
 
       if (senderUuid === undefined) {
diff --git a/ts/textsecure.d.ts b/ts/textsecure.d.ts
index 0270e09bea..73ecd1ba57 100644
--- a/ts/textsecure.d.ts
+++ b/ts/textsecure.d.ts
@@ -1153,9 +1153,9 @@ export declare namespace SyncMessageClass {
     type?: number;
   }
   class ViewOnceOpen {
-    sender?: string;
-    senderUuid?: string;
-    timestamp?: ProtoBinaryType;
+    sender: string | null;
+    senderUuid: string | null;
+    timestamp?: ProtoBinaryType | null;
   }
   class FetchLatest {
     static Type: {
diff --git a/ts/textsecure/SendMessage.ts b/ts/textsecure/SendMessage.ts
index 412238666a..e68436f202 100644
--- a/ts/textsecure/SendMessage.ts
+++ b/ts/textsecure/SendMessage.ts
@@ -1251,7 +1251,7 @@ export default class MessageSender {
   }
 
   async syncViewOnceOpen(
-    sender: string,
+    sender: string | undefined,
     senderUuid: string,
     timestamp: number,
     options?: SendOptionsType
@@ -1266,9 +1266,9 @@ export default class MessageSender {
     const syncMessage = this.createSyncMessage();
 
     const viewOnceOpen = new window.textsecure.protobuf.SyncMessage.ViewOnceOpen();
-    viewOnceOpen.sender = sender;
-    viewOnceOpen.senderUuid = senderUuid;
-    viewOnceOpen.timestamp = timestamp;
+    viewOnceOpen.sender = sender || null;
+    viewOnceOpen.senderUuid = senderUuid || null;
+    viewOnceOpen.timestamp = timestamp || null;
     syncMessage.viewOnceOpen = viewOnceOpen;
 
     const contentMessage = new window.textsecure.protobuf.Content();