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

This commit is contained in:
Michael Kirk 2018-11-15 21:30:18 -06:00
commit 715c9f19d8
2 changed files with 9 additions and 1 deletions

View file

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

View file

@ -203,6 +203,10 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{
[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"
actionBlock:^{
[DebugUIMessages sendFakeMessages:100 * 1000 thread:thread];