From 5ac2f16ebca48b4a4990c4af0ceab8ada66117a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 26 Oct 2017 17:33:44 -0400 Subject: [PATCH 1/3] Skip redundant relayout. // FREEBIE --- .../ConversationView/ConversationViewController.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 328ee074c..5bb10f7f8 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2930,9 +2930,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { OWSAssert([NSThread isMainThread]); if (!success) { - [self resetContentAndLayout]; - } else { - [self.collectionView.collectionViewLayout invalidateLayout]; + DDLogInfo(@"%@ performBatchUpdates did not finish", self.tag); } [self updateLastVisibleTimestamp]; From 9053d038ac710813c09694fcbe6770e7b628d1d4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 26 Oct 2017 17:36:40 -0400 Subject: [PATCH 2/3] Remove extra logging. // FREEBIE --- .../ConversationCollectionView.m | 18 ------------------ 1 file changed, 18 deletions(-) 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 From a0ddb2a06d26292681b153b22404aac157a8e008 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 31 Oct 2017 15:01:29 -0400 Subject: [PATCH 3/3] Respond to CR. // FREEBIE --- .../ConversationView/ConversationViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 5bb10f7f8..3096fa051 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2926,10 +2926,10 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { } [self.collectionView reloadItemsAtIndexPaths:rowsToReload]; } - completion:^(BOOL success) { + completion:^(BOOL finished) { OWSAssert([NSThread isMainThread]); - if (!success) { + if (!finished) { DDLogInfo(@"%@ performBatchUpdates did not finish", self.tag); }