From 87b0692af0b444c16eca69d2352f458555aaf189 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 8 Nov 2017 15:23:48 -0500
Subject: [PATCH] Fixes for scrolling in conversation view.

---
 .../ConversationView/Cells/OWSMessageCell.m            |  3 +++
 .../ConversationView/ConversationInputTextView.h       |  2 --
 .../ConversationView/ConversationInputTextView.m       | 10 ----------
 .../ConversationView/ConversationViewController.m      |  9 +--------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index bfeb5311f..9952dc815 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -973,6 +973,9 @@ NS_ASSUME_NONNULL_BEGIN
     if (self.isIncoming) {
         return NO;
     }
+    if (self.cellType == OWSMessageCellType_DownloadingAttachment) {
+        return NO;
+    }
     if (!self.attachmentStream) {
         return NO;
     }
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h
index 92e9f8b2c..38cf306e8 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h
@@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)didPasteAttachment:(SignalAttachment *_Nullable)attachment;
 
-- (void)inputTextViewDidBecomeFirstResponder;
-
 - (void)inputTextViewSendMessagePressed;
 
 @end
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
index c41f7c542..61770e2b6 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@@ -129,16 +129,6 @@ NS_ASSUME_NONNULL_BEGIN
     return YES;
 }
 
-- (BOOL)becomeFirstResponder
-{
-    BOOL becameFirstResponder = [super becomeFirstResponder];
-    if (becameFirstResponder) {
-        // Intercept to scroll to bottom when text view is tapped.
-        [self.inputTextViewDelegate inputTextViewDidBecomeFirstResponder];
-    }
-    return becameFirstResponder;
-}
-
 - (BOOL)pasteboardHasPossibleAttachment
 {
     // We don't want to load/convert images more than once so we
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 4cf4b489f..10a7988f4 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3507,13 +3507,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
 
 #pragma mark - ConversationInputTextViewDelegate
 
-- (void)inputTextViewDidBecomeFirstResponder
-{
-    OWSAssert([NSThread isMainThread]);
-
-    [self scrollToBottomAnimated:YES];
-}
-
 - (void)inputTextViewSendMessagePressed
 {
     [self sendButtonPressed];
@@ -3632,7 +3625,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [self updateLastVisibleTimestamp];
     [self autoLoadMoreIfNecessary];
 
-    if ([self isScrolledAwayFromBottom]) {
+    if (self.isUserScrolling && [self isScrolledAwayFromBottom]) {
         [self.inputToolbar endEditingTextMessage];
     }
 }