keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reload adjacent rows using original indices, not final indices.

Browse Source
pull/1/head
Matthew Chen 8 years ago
parent 0029b6854f
commit 35bdc86ab5
1 changed files with 30 additions and 58 deletions
Show Stats Download Patch File Download Diff File

88
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -168,7 +168,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
@property (nonatomic, readonly) ConversationViewLayout *layout; @property (nonatomic, readonly) ConversationViewLayout *layout;
@property (nonatomic) NSArray<ConversationViewItem *> *viewItems; @property (nonatomic) NSArray<ConversationViewItem *> *viewItems;
@property (nonatomic) NSMutableDictionary<NSString *, ConversationViewItem *> *viewItemMap; @property (nonatomic) NSMutableDictionary<NSString *, ConversationViewItem *> *viewItemCache;
@property (nonatomic, nullable) MPMoviePlayerController *videoPlayer; @property (nonatomic, nullable) MPMoviePlayerController *videoPlayer;
@property (nonatomic, nullable) AVAudioRecorder *audioRecorder; @property (nonatomic, nullable) AVAudioRecorder *audioRecorder;
@ -2866,7 +2866,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
YapCollectionKey *collectionKey = rowChange.collectionKey; YapCollectionKey *collectionKey = rowChange.collectionKey;
OWSAssert(collectionKey.key.length > 0); OWSAssert(collectionKey.key.length > 0);
if (collectionKey.key) { if (collectionKey.key) {
ConversationViewItem *viewItem = self.viewItemMap[collectionKey.key]; ConversationViewItem *viewItem = self.viewItemCache[collectionKey.key];
[self reloadInteractionForViewItem:viewItem]; [self reloadInteractionForViewItem:viewItem];
} }
break; break;
@ -2876,7 +2876,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
YapCollectionKey *collectionKey = rowChange.collectionKey; YapCollectionKey *collectionKey = rowChange.collectionKey;
OWSAssert(collectionKey.key.length > 0); OWSAssert(collectionKey.key.length > 0);
if (collectionKey.key) { if (collectionKey.key) {
[self.viewItemMap removeObjectForKey:collectionKey.key]; [self.viewItemCache removeObjectForKey:collectionKey.key];
} }
hasDeletions = YES; hasDeletions = YES;
break; break;
@ -2920,7 +2920,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
rowChange.finalIndex); rowChange.finalIndex);
[self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]]; [self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]];
// We don't want to reload a row that we just inserted. // We don't want to reload a row that we just inserted.
[rowsThatChangedSize removeObject:@(rowChange.finalIndex)]; [rowsThatChangedSize removeObject:@(rowChange.originalIndex)];
ConversationViewItem *_Nullable viewItem = [self viewItemForIndex:(NSInteger)rowChange.finalIndex]; ConversationViewItem *_Nullable viewItem = [self viewItemForIndex:(NSInteger)rowChange.finalIndex];
if ([viewItem.interaction isKindOfClass:[TSOutgoingMessage class]]) { if ([viewItem.interaction isKindOfClass:[TSOutgoingMessage class]]) {
@ -2940,7 +2940,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
rowChange.finalIndex); rowChange.finalIndex);
[self.collectionView moveItemAtIndexPath:rowChange.indexPath toIndexPath:rowChange.newIndexPath]; [self.collectionView moveItemAtIndexPath:rowChange.indexPath toIndexPath:rowChange.newIndexPath];
// We don't want to reload a row that we just moved. // We don't want to reload a row that we just moved.
[rowsThatChangedSize removeObject:@(rowChange.finalIndex)]; [rowsThatChangedSize removeObject:@(rowChange.originalIndex)];
break; break;
} }
case YapDatabaseViewChangeUpdate: { case YapDatabaseViewChangeUpdate: {
@ -2950,7 +2950,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
rowChange.finalIndex); rowChange.finalIndex);
[self.collectionView reloadItemsAtIndexPaths:@[ rowChange.indexPath ]]; [self.collectionView reloadItemsAtIndexPaths:@[ rowChange.indexPath ]];
// We don't want to reload a row that we've already reloaded. // We don't want to reload a row that we've already reloaded.
[rowsThatChangedSize removeObject:@(rowChange.finalIndex)]; [rowsThatChangedSize removeObject:@(rowChange.originalIndex)];
break; break;
} }
} }
@ -2970,59 +2970,31 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
DDLogVerbose(@"self.viewItems.count: %zd -> %zd", oldViewItemCount, self.viewItems.count); DDLogVerbose(@"self.viewItems.count: %zd -> %zd", oldViewItemCount, self.viewItems.count);
BOOL shouldReloadCollection = [self shouldReloadCollection:rowChanges]; BOOL shouldAnimateUpdates = [self shouldAnimateRowUpdates:rowChanges oldViewItemCount:oldViewItemCount];
if (shouldReloadCollection) { void (^batchUpdatesCompletion)(BOOL) = ^(BOOL finished) {
[UIView performWithoutAnimation:^{ OWSAssert([NSThread isMainThread]);
[self.collectionView reloadData];
}];
[self updateLastVisibleTimestamp];
if (hasDeletions) {
[self cleanUpUnreadIndicatorIfNecessary];
}
} else {
BOOL shouldAnimateUpdates = [self shouldAnimateRowUpdates:rowChanges oldViewItemCount:oldViewItemCount];
void (^batchUpdatesCompletion)(BOOL) = ^(BOOL finished) {
OWSAssert([NSThread isMainThread]);
if (!finished) {
DDLogInfo(@"%@ performBatchUpdates did not finish", self.logTag);
}
[self updateLastVisibleTimestamp];
if (scrollToBottom) { if (!finished) {
[self scrollToBottomAnimated:shouldAnimateScrollToBottom && shouldAnimateUpdates]; DDLogInfo(@"%@ performBatchUpdates did not finish", self.logTag);
}
if (hasDeletions) {
[self cleanUpUnreadIndicatorIfNecessary];
}
};
if (shouldAnimateUpdates) {
[self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
} else {
[UIView performWithoutAnimation:^{
[self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
}];
} }
}
}
- (BOOL)shouldReloadCollection:(NSArray<YapDatabaseViewRowChange *> *)rowChanges [self updateLastVisibleTimestamp];
{
OWSAssert(rowChanges);
for (YapDatabaseViewRowChange *rowChange in rowChanges) { if (scrollToBottom) {
switch (rowChange.type) { [self scrollToBottomAnimated:shouldAnimateScrollToBottom && shouldAnimateUpdates];
case YapDatabaseViewChangeMove:
// "Move" changes cannot be safely performed using
// [UICollectionView performBatchUpdates:]. This appears to be a
// bug in YapDatabase.
return YES;
default:
break;
} }
if (hasDeletions) {
[self cleanUpUnreadIndicatorIfNecessary];
}
};
if (shouldAnimateUpdates) {
[self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
} else {
[UIView performWithoutAnimation:^{
[self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
}];
} }
return NO;
} }
- (BOOL)shouldAnimateRowUpdates:(NSArray<YapDatabaseViewRowChange *> *)rowChanges - (BOOL)shouldAnimateRowUpdates:(NSArray<YapDatabaseViewRowChange *> *)rowChanges
@ -4013,7 +3985,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
// ViewItems modified while we were not observing may be stale. // ViewItems modified while we were not observing may be stale.
// //
// TODO: have a more fine-grained cache expiration based on rows modified. // TODO: have a more fine-grained cache expiration based on rows modified.
[self.viewItemMap removeAllObjects]; [self.viewItemCache removeAllObjects];
[self resetMappings]; [self resetMappings];
@ -4088,7 +4060,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
- (NSSet<NSNumber *> *)reloadViewItems - (NSSet<NSNumber *> *)reloadViewItems
{ {
NSMutableArray<ConversationViewItem *> *viewItems = [NSMutableArray new]; NSMutableArray<ConversationViewItem *> *viewItems = [NSMutableArray new];
NSMutableDictionary<NSString *, ConversationViewItem *> *viewItemMap = [NSMutableDictionary new]; NSMutableDictionary<NSString *, ConversationViewItem *> *viewItemCache = [NSMutableDictionary new];
NSUInteger count = [self.messageMappings numberOfItemsInSection:0]; NSUInteger count = [self.messageMappings numberOfItemsInSection:0];
BOOL isGroupThread = self.isGroupConversation; BOOL isGroupThread = self.isGroupConversation;
@ -4101,7 +4073,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
[viewTransaction objectAtRow:row inSection:0 withMappings:self.messageMappings]; [viewTransaction objectAtRow:row inSection:0 withMappings:self.messageMappings];
OWSAssert(interaction); OWSAssert(interaction);
ConversationViewItem *_Nullable viewItem = self.viewItemMap[interaction.uniqueId]; ConversationViewItem *_Nullable viewItem = self.viewItemCache[interaction.uniqueId];
if (viewItem) { if (viewItem) {
viewItem.previousRow = viewItem.row; viewItem.previousRow = viewItem.row;
} else { } else {
@ -4111,8 +4083,8 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
} }
viewItem.row = (NSInteger)row; viewItem.row = (NSInteger)row;
[viewItems addObject:viewItem]; [viewItems addObject:viewItem];
OWSAssert(!viewItemMap[interaction.uniqueId]); OWSAssert(!viewItemCache[interaction.uniqueId]);
viewItemMap[interaction.uniqueId] = viewItem; viewItemCache[interaction.uniqueId] = viewItem;
} }
}]; }];
@ -4202,7 +4174,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
} }
self.viewItems = viewItems; self.viewItems = viewItems;
self.viewItemMap = viewItemMap; self.viewItemCache = viewItemCache;
return [rowsThatChangedSize copy]; return [rowsThatChangedSize copy];
} }

Write Preview
Loading…
Cancel
Save