diff --git a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m b/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m index dd73aa288..b3c3bc5de 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m +++ b/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 *)indexPaths -{ - DDLogVerbose(@"%@ reloadItemsAtIndexPaths", self.logTag); - [super reloadItemsAtIndexPaths:indexPaths]; -} - #pragma mark - Logging + (NSString *)logTag diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 328ee074c..3096fa051 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/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) { - [self resetContentAndLayout]; - } else { - [self.collectionView.collectionViewLayout invalidateLayout]; + if (!finished) { + DDLogInfo(@"%@ performBatchUpdates did not finish", self.tag); } [self updateLastVisibleTimestamp];