Merge branch 'charlesmchen/fixSyncTranscripts'

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];
+    // Sync messages have no thread or destination.
-    OWSAssert(localNumber.length > 0);
+    OWSAssert(!self.message.thread.contactIdentifier);
-    OWSAssert([localNumber isEqualToString:self.message.thread.contactIdentifier]);
+    [sentBuilder setDestination:nil];
-    [sentBuilder setDestination:localNumber];
+    [sentBuilder setMessage:[self.message buildDataMessage:nil]];
-    [sentBuilder setMessage:[self.message buildDataMessage:localNumber]];
     [sentBuilder setExpirationStartTimestamp:self.message.timestamp];
 
     [syncMessageBuilder setSentBuilder:sentBuilder];