Merge branch 'mkirk/keyboard-hides-last-messages'

Signal/src/ViewControllers/ConversationView/MessagesViewController.m

@@ -3946,7 +3946,7 @@ typedef enum : NSUInteger {
     [self presentViewController:controller animated:YES completion:nil];
 }
 
-- (void)textViewDidChangeSize
+- (void)textViewDidChangePosition
 {
     OWSAssert([NSThread isMainThread]);
 

Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)didPasteAttachment:(SignalAttachment *_Nullable)attachment;
 
-- (void)textViewDidChangeSize;
+- (void)textViewDidChangePosition;
 
 @end
 

Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.m

@@ -14,6 +14,16 @@ 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.textViewPasteDelegate textViewDidChangePosition];
+    }
+    return becameFirstResponder;
+}
+
 - (BOOL)pasteboardHasPossibleAttachment
 {
     // We don't want to load/convert images more than once so we
@@ -51,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
     [super setFrame:frame];
 
     if (didChangeSize && isNonEmpty) {
-        [self.textViewPasteDelegate textViewDidChangeSize];
+        [self.textViewPasteDelegate textViewDidChangePosition];
     }
 }
 
@@ -63,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN
     [super setBounds:bounds];
 
     if (didChangeSize && isNonEmpty) {
-        [self.textViewPasteDelegate textViewDidChangeSize];
+        [self.textViewPasteDelegate textViewDidChangePosition];
     }
 }