From 00c6ed2f3c968bdff7be433d3fdfc9f590420e3c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 7 Dec 2018 13:02:43 -0500 Subject: [PATCH] Tweak scroll down animation behavior in conversation view. --- .../ConversationView/ConversationViewController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 75537bd8d..ee52ec121 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3648,7 +3648,7 @@ typedef enum : NSUInteger { // sends a message. Normally, this is taken care of in yapDatabaseModified:, but // we don't listen to db modifications when this view isn't visible, i.e. when the // attachment approval view is presented. - [self scrollToBottomAnimated:YES]; + [self scrollToBottomAnimated:NO]; } - (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval @@ -3716,7 +3716,7 @@ typedef enum : NSUInteger { CGFloat dstY = MAX(firstContentPageTop, lastContentPageTop); - [self.collectionView setContentOffset:CGPointMake(0, dstY) animated:NO]; + [self.collectionView setContentOffset:CGPointMake(0, dstY) animated:animated]; [self didScrollToBottom]; } @@ -4510,7 +4510,7 @@ typedef enum : NSUInteger { animations:^{ [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion]; if (scrollToBottom) { - [self scrollToBottomAnimated:shouldAnimateUpdates]; + [self scrollToBottomAnimated:NO]; } }]; }