Merge branch 'charlesmchen/approveAllAttachments'

Signal/src/ViewControllers/MessagesViewController.m

@@ -2186,7 +2186,7 @@ typedef enum : NSUInteger {
                                              [self showErrorAlertForAttachment:attachment];
                                              failedToPickAttachment(nil);
                                          } else {
-                                             [self sendMessageAttachment:attachment];
+                                             [self tryToSendAttachmentIfApproved:attachment];
                                          }
                                      } else {
                                          failedToPickAttachment(nil);
@@ -2233,7 +2233,7 @@ typedef enum : NSUInteger {
                                               [self showErrorAlertForAttachment:attachment];
                                               failedToPickAttachment(nil);
                                           } else {
-                                              [self sendMessageAttachment:attachment];
+                                              [self tryToSendAttachmentIfApproved:attachment];
                                           }
                                       }];
          }];
@@ -2242,18 +2242,16 @@ typedef enum : NSUInteger {
 
 - (void)sendMessageAttachment:(SignalAttachment *)attachment
 {
+    OWSAssert([NSThread isMainThread]);
     // TODO: Should we assume non-nil or should we check for non-nil?
     OWSAssert(attachment != nil);
     OWSAssert(![attachment hasError]);
     OWSAssert([attachment mimeType].length > 0);
 
-    DispatchMainThreadSafe(^{
     DDLogVerbose(@"Sending attachment. Size in bytes: %lu, contentType: %@",
         (unsigned long)attachment.data.length,
         [attachment mimeType]);
-        [ThreadUtil sendMessageWithAttachment:attachment
+    [ThreadUtil sendMessageWithAttachment:attachment inThread:self.thread messageSender:self.messageSender];
-                                     inThread:self.thread
-                                messageSender:self.messageSender];
 
     TSOutgoingMessage *message;
     OWSDisappearingMessagesConfiguration *configuration =
@@ -2270,7 +2268,6 @@ typedef enum : NSUInteger {
                                                    messageBody:nil
                                                  attachmentIds:[NSMutableArray new]];
     }
-    });
 }
 
 - (NSURL *)videoTempFolder {
@@ -2311,7 +2308,7 @@ typedef enum : NSUInteger {
                       attachment ? [attachment errorName] : @"Missing data");
             [self showErrorAlertForAttachment:attachment];
         } else {
-            [self sendMessageAttachment:attachment];
+            [self tryToSendAttachmentIfApproved:attachment];
         }
         
         NSError *error;
@@ -2551,7 +2548,7 @@ typedef enum : NSUInteger {
                       attachment ? [attachment errorName] : @"Missing data");
             [self showErrorAlertForAttachment:attachment];
         } else {
-            [self sendMessageAttachment:attachment];
+            [self tryToSendAttachmentIfApproved:attachment];
         }
     }
 }
@@ -2772,18 +2769,25 @@ typedef enum : NSUInteger {
                self.tag,
                __PRETTY_FUNCTION__);
 
+    [self tryToSendAttachmentIfApproved:attachment];
+}
+
+- (void)tryToSendAttachmentIfApproved:(SignalAttachment *_Nullable)attachment
+{
+    DDLogError(@"%@ %s", self.tag, __PRETTY_FUNCTION__);
+
+    DispatchMainThreadSafe(^{
         if ([self isBlockedContactConversation]) {
             __weak MessagesViewController *weakSelf = self;
             [self showUnblockContactUI:^(BOOL isBlocked) {
                 if (!isBlocked) {
-                [weakSelf didPasteAttachment:attachment];
+                    [weakSelf tryToSendAttachmentIfApproved:attachment];
                 }
             }];
             return;
         }
 
-    if (attachment == nil ||
+        if (attachment == nil || [attachment hasError]) {
-        [attachment hasError]) {
             DDLogWarn(@"%@ %s Invalid attachment: %@.",
                 self.tag,
                 __PRETTY_FUNCTION__,
@@ -2791,15 +2795,16 @@ typedef enum : NSUInteger {
             [self showErrorAlertForAttachment:attachment];
         } else {
             __weak MessagesViewController *weakSelf = self;
-        UIViewController *viewController = [[AttachmentApprovalViewController alloc] initWithAttachment:attachment
+            UIViewController *viewController =
+                [[AttachmentApprovalViewController alloc] initWithAttachment:attachment
                                                            successCompletion:^{
                                                                [weakSelf sendMessageAttachment:attachment];
                                                            }];
-        UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
+            UINavigationController *navigationController =
-        [self.navigationController presentViewController:navigationController
+                [[UINavigationController alloc] initWithRootViewController:viewController];
-                                                animated:YES
+            [self.navigationController presentViewController:navigationController animated:YES completion:nil];
-                                              completion:nil];
         }
+    });
 }
 
 - (void)showErrorAlertForAttachment:(SignalAttachment * _Nullable)attachment {