From 3c28f15dbdf805675205558818ecbb5269a23e44 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 16 Jun 2017 11:59:35 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 .../ViewControllers/DebugUI/DebugUIMessages.m | 19 ++++++++-----------
 Signal/src/util/ThreadUtil.h                  |  1 +
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index 26adc680a..8661dd57c 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -65,15 +65,15 @@ NS_ASSUME_NONNULL_BEGIN
                                        actionBlock:^{
                                            [DebugUIMessages sendTinyAttachments:1000 thread:thread];
                                        }],
-                       [OWSTableItem itemWithTitle:@"Send fake 10 messages"
+                       [OWSTableItem itemWithTitle:@"Create 10 fake messages"
                                        actionBlock:^{
                                            [DebugUIMessages sendFakeMessages:10 thread:thread];
                                        }],
-                       [OWSTableItem itemWithTitle:@"Send fake 1k messages"
+                       [OWSTableItem itemWithTitle:@"Create 1k fake messages"
                                        actionBlock:^{
                                            [DebugUIMessages sendFakeMessages:1000 thread:thread];
                                        }],
-                       [OWSTableItem itemWithTitle:@"Send fake 10k messages"
+                       [OWSTableItem itemWithTitle:@"Create 10k fake messages"
                                        actionBlock:^{
                                            [DebugUIMessages sendFakeMessages:10 * 1000 thread:thread];
                                        }],
@@ -828,14 +828,11 @@ NS_ASSUME_NONNULL_BEGIN
                     break;
                 }
                 case 3: {
-                    OWSDisappearingMessagesConfiguration *configuration =
-                        [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId
-                                                                          transaction:transaction];
-                    TSOutgoingMessage *message = [[TSOutgoingMessage alloc]
-                        initWithTimestamp:[NSDate ows_millisecondTimeStamp]
-                                 inThread:thread
-                           isVoiceMessage:NO
-                         expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
+                    TSOutgoingMessage *message =
+                        [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
+                                                            inThread:thread
+                                                      isVoiceMessage:NO
+                                                    expiresInSeconds:0];
 
                     NSString *filename = @"test.mp3";
                     TSAttachmentStream *attachmentStream =
diff --git a/Signal/src/util/ThreadUtil.h b/Signal/src/util/ThreadUtil.h
index 544803394..a79199b57 100644
--- a/Signal/src/util/ThreadUtil.h
+++ b/Signal/src/util/ThreadUtil.h
@@ -54,6 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
                                         inThread:(TSThread *)thread
                                    messageSender:(OWSMessageSender *)messageSender;
 
+// We only should set ignoreErrors in debug or test code.
 + (TSOutgoingMessage *)sendMessageWithAttachment:(SignalAttachment *)attachment
                                         inThread:(TSThread *)thread
                                    messageSender:(OWSMessageSender *)messageSender