Merge remote-tracking branch 'origin/charlesmchen/fixMessageTaps'

Signal/src/ViewControllers/ConversationView/Cells/ConversationViewCell.h

@@ -41,6 +41,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSCache *)cellMediaCache;
 
+#pragma mark - Messages
+
+- (void)didTapFailedOutgoingMessage:(TSOutgoingMessage *)message;
+
 @end
 
 #pragma mark -

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h

@@ -35,8 +35,6 @@ typedef NS_ENUM(NSUInteger, OWSMessageGestureLocation) {
 - (void)didTapFailedIncomingAttachment:(ConversationViewItem *)viewItem
                      attachmentPointer:(TSAttachmentPointer *)attachmentPointer;
 
-- (void)didTapFailedOutgoingMessage:(TSOutgoingMessage *)message;
-
 - (void)didTapConversationItem:(ConversationViewItem *)viewItem quotedReply:(OWSQuotedReplyModel *)quotedReply;
 - (void)didTapConversationItem:(ConversationViewItem *)viewItem
                                  quotedReply:(OWSQuotedReplyModel *)quotedReply
@@ -73,8 +71,16 @@ typedef NS_ENUM(NSUInteger, OWSMessageGestureLocation) {
 
 - (void)prepareForReuse;
 
+#pragma mark - Gestures
+
 - (OWSMessageGestureLocation)gestureLocationForLocation:(CGPoint)locationInMessageBubble;
 
+// This only needs to be called when we use the cell _outside_ the context
+// of a conversation view message cell.
+- (void)addTapGestureHandler;
+
+- (void)handleTapGesture:(UITapGestureRecognizer *)sender;
+
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -67,10 +67,6 @@ NS_ASSUME_NONNULL_BEGIN
     [self addSubview:self.bubbleView];
     [self.bubbleView autoPinEdgesToSuperviewEdges];
 
-    UITapGestureRecognizer *tap =
-        [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
-    [self addGestureRecognizer:tap];
-
     self.bodyTextView = [self newTextView];
     // Setting dataDetectorTypes is expensive.  Do it just once.
     self.bodyTextView.dataDetectorTypes
@@ -1071,6 +1067,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Gestures
 
+- (void)addTapGestureHandler
+{
+    UITapGestureRecognizer *tap =
+        [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
+    [self addGestureRecognizer:tap];
+}
+
 - (void)handleTapGesture:(UITapGestureRecognizer *)sender
 {
     OWSAssert(self.delegate);
@@ -1083,7 +1086,6 @@ NS_ASSUME_NONNULL_BEGIN
     if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
         TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
         if (outgoingMessage.messageState == TSOutgoingMessageStateUnsent) {
-            [self.delegate didTapFailedOutgoingMessage:outgoingMessage];
             return;
         } else if (outgoingMessage.messageState == TSOutgoingMessageStateAttemptingOut) {
             // Ignore taps on outgoing messages being sent.

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m

@@ -83,6 +83,10 @@ NS_ASSUME_NONNULL_BEGIN
 
     self.contentView.userInteractionEnabled = YES;
 
+    UITapGestureRecognizer *tap =
+        [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
+    [self addGestureRecognizer:tap];
+
     UILongPressGestureRecognizer *longPress =
         [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPressGesture:)];
     [self.contentView addGestureRecognizer:longPress];
@@ -490,6 +494,29 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Gesture recognizers
 
+- (void)handleTapGesture:(UITapGestureRecognizer *)sender
+{
+    OWSAssert(self.delegate);
+
+    if (sender.state != UIGestureRecognizerStateRecognized) {
+        DDLogVerbose(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.debugDescription);
+        return;
+    }
+
+    if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
+        TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
+        if (outgoingMessage.messageState == TSOutgoingMessageStateUnsent) {
+            [self.delegate didTapFailedOutgoingMessage:outgoingMessage];
+            return;
+        } else if (outgoingMessage.messageState == TSOutgoingMessageStateAttemptingOut) {
+            // Ignore taps on outgoing messages being sent.
+            return;
+        }
+    }
+
+    [self.messageBubbleView handleTapGesture:sender];
+}
+
 - (void)handleLongPressGesture:(UILongPressGestureRecognizer *)sender
 {
     OWSAssert(self.delegate);

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -2163,7 +2163,7 @@ typedef enum : NSUInteger {
     }];
 }
 
-- (void)didTapConversationItem:(ConversationViewItem *)viewItem quotedMessage:(OWSQuotedReplyModel *)quotedReply
+- (void)didTapConversationItem:(ConversationViewItem *)viewItem quotedReply:(OWSQuotedReplyModel *)quotedReply
 {
     OWSAssertIsOnMainThread();
     OWSAssert(viewItem);

Signal/src/ViewControllers/MessageDetailViewController.swift

@@ -322,6 +322,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
 
         let messageBubbleView = OWSMessageBubbleView(frame: CGRect.zero)
         messageBubbleView.delegate = self
+        messageBubbleView.addTapGestureHandler()
         self.messageBubbleView = messageBubbleView
         messageBubbleView.viewItem = viewItem
         messageBubbleView.cellMediaCache = NSCache()