From 1ad3add1d51ef4bdafdb0e295e469e0662398a8f Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 18 Oct 2017 22:46:19 -0700
Subject: [PATCH] Fix message injection.

// FREEBIE
---
 Signal/src/ViewControllers/DebugUI/DebugUIMessages.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index a22f359aa..41e6bfe38 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -1076,7 +1076,7 @@ NS_ASSUME_NONNULL_BEGIN
         dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
         ^{
             for (int i = 0; i < counter; i++) {
-                [self injectIncomingMessageInThread:thread counter:counter];
+                [self injectIncomingMessageInThread:thread counter:counter - i];
             }
         });
 }
@@ -1108,7 +1108,9 @@ NS_ASSUME_NONNULL_BEGIN
     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";
+    if (!recipientId) {
+        recipientId = @"+12345678901";
+    }
 
     OWSSignalServiceProtosEnvelopeBuilder *envelopeBuilder = [OWSSignalServiceProtosEnvelopeBuilder new];
     [envelopeBuilder setType:OWSSignalServiceProtosEnvelopeTypeCiphertext];