From 8f19622a89bc9bf08214d4154428204c39740ba2 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 25 Apr 2018 15:10:03 -0400
Subject: [PATCH] Fix sync transcripts.

---
 .../DeviceSyncing/OWSOutgoingSentMessageTranscript.m   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
index 4b0bf8b86..aac4a9848 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
@@ -4,7 +4,6 @@
 
 #import "OWSOutgoingSentMessageTranscript.h"
 #import "OWSSignalServiceProtos.pb.h"
-#import "TSAccountManager.h"
 #import "TSOutgoingMessage.h"
 #import "TSThread.h"
 
@@ -51,11 +50,10 @@ NS_ASSUME_NONNULL_BEGIN
     OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder = [OWSSignalServiceProtosSyncMessageSentBuilder new];
     [sentBuilder setTimestamp:self.message.timestamp];
 
-    NSString *_Nullable localNumber = [TSAccountManager localNumber];
-    OWSAssert(localNumber.length > 0);
-    OWSAssert([localNumber isEqualToString:self.message.thread.contactIdentifier]);
-    [sentBuilder setDestination:localNumber];
-    [sentBuilder setMessage:[self.message buildDataMessage:localNumber]];
+    // Sync messages have no thread or destination.
+    OWSAssert(!self.message.thread.contactIdentifier);
+    [sentBuilder setDestination:nil];
+    [sentBuilder setMessage:[self.message buildDataMessage:nil]];
     [sentBuilder setExpirationStartTimestamp:self.message.timestamp];
 
     [syncMessageBuilder setSentBuilder:sentBuilder];