Merge branch 'charlesmchen/redundantContentInsets'

7 years ago · 3395bdab69
parent 55158e2a59 cea93784b1
commit 3395bdab69
1 changed files with 3 additions and 1 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -4164,7 +4164,9 @@ typedef enum : NSUInteger {
    BOOL wasScrolledToBottom = [self isScrolledToBottom];

    void (^adjustInsets)(void) = ^(void) {
+        if (!UIEdgeInsetsEqualToEdgeInsets(self.collectionView.contentInset, newInsets)) {
            self.collectionView.contentInset = newInsets;
+        }
        self.collectionView.scrollIndicatorInsets = newInsets;

        // Note there is a bug in iOS11.2 which where switching to the emoji keyboard