Merge branch 'charlesmchen/streamlineRelayout'

Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m

@@ -81,24 +81,6 @@ NS_ASSUME_NONNULL_BEGIN
     [super setContentOffset:contentOffset];
 }
 
-- (void)reloadData
-{
-    DDLogVerbose(@"%@ reloadData", self.logTag);
-    [super reloadData];
-}
-
-- (void)reloadSections:(NSIndexSet *)sections
-{
-    DDLogVerbose(@"%@ reloadSections", self.logTag);
-    [super reloadSections:sections];
-}
-
-- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-    DDLogVerbose(@"%@ reloadItemsAtIndexPaths", self.logTag);
-    [super reloadItemsAtIndexPaths:indexPaths];
-}
-
 #pragma mark - Logging
 
 + (NSString *)logTag

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -2926,13 +2926,11 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         }
         [self.collectionView reloadItemsAtIndexPaths:rowsToReload];
     }
-        completion:^(BOOL success) {
+        completion:^(BOOL finished) {
             OWSAssert([NSThread isMainThread]);
 
-            if (!success) {
+            if (!finished) {
-                [self resetContentAndLayout];
+                DDLogInfo(@"%@ performBatchUpdates did not finish", self.tag);
-            } else {
-                [self.collectionView.collectionViewLayout invalidateLayout];
             }
 
             [self updateLastVisibleTimestamp];