Merge branch 'charlesmchen/ignoreTapsOnOutgoingMessages'

2017-05-12 14:34:14 -04:00 · 2017-05-12 14:34:14 -04:00 · f3f4514f08
commit f3f4514f08
parent 13f4b0ac63 12e45eaf84
1 changed files with 4 additions and 0 deletions
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@ -2065,7 +2065,11 @@ typedef enum : NSUInteger {
                // We want to activate fullscreen media view for sent items
                // but not those which failed-to-send
                break;
+            } else if (outgoingMessage.messageState == TSOutgoingMessageStateAttemptingOut) {
+                // Ignore taps on outgoing messages being sent.
+                break;
            }
+
            // No `break` as we want to fall through to capture tapping on Outgoing media items too
        }
        case TSIncomingMessageAdapter: {