Merge remote-tracking branch 'origin/charlesmchen/multipleLoadMore' into release/2.32.0

pull/1/head
Michael Kirk 7 years ago
commit 715c9f19d8

@ -3746,7 +3746,11 @@ typedef enum : NSUInteger {
- (void)scrollViewDidScroll:(UIScrollView *)scrollView - (void)scrollViewDidScroll:(UIScrollView *)scrollView
{ {
[self updateLastVisibleTimestamp]; [self updateLastVisibleTimestamp];
[self autoLoadMoreIfNecessary];
__weak ConversationViewController *weakSelf = self;
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf autoLoadMoreIfNecessary];
});
} }
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView

@ -203,6 +203,10 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{ actionBlock:^{
[DebugUIMessages sendFakeMessages:10 * 1000 thread:thread]; [DebugUIMessages sendFakeMessages:10 * 1000 thread:thread];
}], }],
[OWSTableItem itemWithTitle:@"Create 10k fake text messages"
actionBlock:^{
[DebugUIMessages sendFakeMessages:10 * 1000 thread:thread isTextOnly:YES];
}],
[OWSTableItem itemWithTitle:@"Create 100k fake messages" [OWSTableItem itemWithTitle:@"Create 100k fake messages"
actionBlock:^{ actionBlock:^{
[DebugUIMessages sendFakeMessages:100 * 1000 thread:thread]; [DebugUIMessages sendFakeMessages:100 * 1000 thread:thread];

Loading…
Cancel
Save