Respond to CR.

// FREEBIE

Signal/src/ViewControllers/DebugUI/DebugUIStress.m

@@ -464,7 +464,8 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(thread);
     OWSAssert(block);
 
-    OWSDynamicOutgoingMessage *message = [[OWSDynamicOutgoingMessage alloc] initWithBlock:block thread:thread];
+    OWSDynamicOutgoingMessage *message =
+        [[OWSDynamicOutgoingMessage alloc] initWithPlainTextDataBlock:block thread:thread];
 
     [self sendStressMessage:message];
 }
@@ -475,7 +476,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(block);
 
     OWSDynamicOutgoingMessage *message =
-        [[OWSDynamicOutgoingMessage alloc] initWithBlock:block timestamp:timestamp thread:thread];
+        [[OWSDynamicOutgoingMessage alloc] initWithPlainTextDataBlock:block timestamp:timestamp thread:thread];
 
     [self sendStressMessage:message];
 }

SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h

@@ -13,10 +13,10 @@ typedef NSData *_Nonnull (^DynamicOutgoingMessageBlock)(SignalRecipient *);
 
 @interface OWSDynamicOutgoingMessage : TSOutgoingMessage
 
-- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread;
-- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block
-                    timestamp:(uint64_t)timestamp
-                       thread:(nullable TSThread *)thread;
+- (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread;
+- (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block
+                                 timestamp:(uint64_t)timestamp
+                                    thread:(nullable TSThread *)thread;
 
 @end
 

SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m

@@ -18,14 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation OWSDynamicOutgoingMessage
 
-- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread
+- (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread
 {
-    return [self initWithBlock:block timestamp:[NSDate ows_millisecondTimeStamp] thread:thread];
+    return [self initWithPlainTextDataBlock:block timestamp:[NSDate ows_millisecondTimeStamp] thread:thread];
 }
 
-- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block
-                    timestamp:(uint64_t)timestamp
-                       thread:(nullable TSThread *)thread
+- (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block
+                                 timestamp:(uint64_t)timestamp
+                                    thread:(nullable TSThread *)thread
 {
     self = [super initWithTimestamp:timestamp inThread:thread];
 
@@ -43,23 +43,13 @@ NS_ASSUME_NONNULL_BEGIN
     // There's no need to save this message, since it's not displayed to the user.
 }
 
-//- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder
-//{
-//    OWSSignalServiceProtosDataMessageBuilder *builder = [super dataMessageBuilder];
-//    [builder setFlags:OWSSignalServiceProtosDataMessageFlagsEndSession];
-//
-//    return builder;
-//}
-
 - (NSData *)buildPlainTextData:(SignalRecipient *)recipient
 {
     NSData *plainTextData = self.block(recipient);
     OWSAssert(plainTextData);
     return plainTextData;
-    //    OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new];
-    //    contentBuilder.dataMessage = [self buildDataMessage:recipient.recipientId];
-    //    return [[contentBuilder build] data];
 }
+
 @end
 
 NS_ASSUME_NONNULL_END