Merge branch 'mkirk/disappear-from-lock-screen'

Signal/src/network/PushManager.m

@@ -8,6 +8,7 @@
 #import "OWSContactsManager.h"
 #import "PropertyListPreferences.h"
 #import "Signal-Swift.h"
+#import "ThreadUtil.h"
 #import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/OWSSignalService.h>
@@ -147,16 +148,16 @@ NSString *const Signal_Message_MarkAsRead_Identifier = @"Signal_Message_MarkAsRe
 
         if (threadId) {
             TSThread *thread = [TSThread fetchObjectWithUniqueID:threadId];
-            TSOutgoingMessage *message =
+            NSString *replyText = responseInfo[UIUserNotificationActionResponseTypedTextKey];
-                [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
+
-                                                    inThread:thread
+            [ThreadUtil sendMessageWithText:replyText
-                                                 messageBody:responseInfo[UIUserNotificationActionResponseTypedTextKey]];
+                inThread:thread
-            [self.messageSender sendMessage:message
+                messageSender:self.messageSender
                 success:^{
                     // TODO do we really want to mark them all as read?
                     [self markAllInThreadAsRead:notification.userInfo completionHandler:completionHandler];
                 }
-                failure:^(NSError *error) {
+                failure:^(NSError *_Nonnull error) {
                     // TODO Surface the specific error in the notification?
                     DDLogError(@"Message send failed with error: %@", error);
 

Signal/src/util/ThreadUtil.h

@@ -48,6 +48,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ThreadUtil : NSObject
 
++ (TSOutgoingMessage *)sendMessageWithText:(NSString *)text
+                                  inThread:(TSThread *)thread
+                             messageSender:(OWSMessageSender *)messageSender
+                                   success:(void (^)())successHandler
+                                   failure:(void (^)(NSError *error))failureHandler;
+
 + (TSOutgoingMessage *)sendMessageWithText:(NSString *)text
                                   inThread:(TSThread *)thread
                              messageSender:(OWSMessageSender *)messageSender;

Signal/src/util/ThreadUtil.m

@@ -48,6 +48,24 @@ NS_ASSUME_NONNULL_BEGIN
 + (TSOutgoingMessage *)sendMessageWithText:(NSString *)text
                                   inThread:(TSThread *)thread
                              messageSender:(OWSMessageSender *)messageSender
+{
+    return [self sendMessageWithText:text
+        inThread:thread
+        messageSender:messageSender
+        success:^{
+            DDLogInfo(@"%@ Successfully sent message.", self.tag);
+        }
+        failure:^(NSError *error) {
+            DDLogWarn(@"%@ Failed to deliver message with error: %@", self.tag, error);
+        }];
+}
+
+
++ (TSOutgoingMessage *)sendMessageWithText:(NSString *)text
+                                  inThread:(TSThread *)thread
+                             messageSender:(OWSMessageSender *)messageSender
+                                   success:(void (^)())successHandler
+                                   failure:(void (^)(NSError *error))failureHandler
 {
     OWSAssert([NSThread isMainThread]);
     OWSAssert(text.length > 0);
@@ -62,13 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
                                          messageBody:text
                                        attachmentIds:[NSMutableArray new]
                                     expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
-    [messageSender sendMessage:message
+
-        success:^{
+    [messageSender sendMessage:message success:successHandler failure:failureHandler];
-            DDLogInfo(@"%@ Successfully sent message.", self.tag);
-        }
-        failure:^(NSError *error) {
-            DDLogWarn(@"%@ Failed to deliver message with error: %@", self.tag, error);
-        }];
 
     return message;
 }