From ccb37bfac3836bccbae62ceb94705b052e29afbb Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 18 Oct 2017 08:50:47 -0700
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 Signal/src/ViewControllers/DebugUI/DebugUIMessages.m | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index dbd9439f78..a22f359aa8 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -1103,9 +1103,16 @@ NS_ASSUME_NONNULL_BEGIN
     [payloadBuilder setDataMessage:dataMessageBuilder.build];
     NSData *plaintextData = [payloadBuilder build].data;
 
+    // Try to use an arbitrary member of the current thread that isn't
+    // ourselves as the sender.
+    NSString *_Nullable recipientId = [[thread recipientIdentifiers] firstObject];
+    // This might be an "empty" group with no other members.  If so, use a fake
+    // sender id.
+    recipientId = @"+12345678901";
+
     OWSSignalServiceProtosEnvelopeBuilder *envelopeBuilder = [OWSSignalServiceProtosEnvelopeBuilder new];
     [envelopeBuilder setType:OWSSignalServiceProtosEnvelopeTypeCiphertext];
-    [envelopeBuilder setSource:@"+12345678901"];
+    [envelopeBuilder setSource:recipientId];
     [envelopeBuilder setSourceDevice:1];
     [envelopeBuilder setTimestamp:[NSDate ows_millisecondTimeStamp]];
     [envelopeBuilder setContent:plaintextData];