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

Merge pull request #380 from RyanRory/unread-messages-crash 

Fix Crash in Very Long Conversations
This commit is contained in:
Niels Andriesse 2021-04-08 10:28:42 +10:00 committed by GitHub
parent a2f98b0463 513775b952
commit e215c72912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Session/Conversations/ConversationViewModel.m
View File

@ -173,7 +173,7 @@ NS_ASSUME_NONNULL_BEGIN
static const int kYapDatabasePageSize = 100;
// Never show more than n messages in conversation view when user arrives.
static const int kConversationInitialMaxRangeSize = 25000; // TODO: Does it cause issues to set this so high?
static const int kConversationInitialMaxRangeSize = 100;
// Never show more than n messages in conversation view at a time.
static const int kYapDatabaseRangeMaxLength = 25000;

14
SignalUtilitiesKit/Utilities/ThreadUtil.m
View File

@ -169,6 +169,12 @@ NS_ASSUME_NONNULL_BEGIN
// the messages view the position of the unread indicator,
// so that it can widen its "load window" to always show
// the unread indicator.
//
// We'll load all of the unread messages. This number may be larger
// than the maxRangeSize. This is not the idealest solution for the
// crash when unread message number is over 100. We can do better if
// we just load maxRangeSize number of unread messages, but the unread
// indicator can still be at the correct position.
__block long visibleUnseenMessageCount = 0;
__block TSInteraction *interactionAfterUnreadIndicator = nil;
__block BOOL hasMoreUnseenMessages = NO;
@ -198,14 +204,6 @@ NS_ASSUME_NONNULL_BEGIN
visibleUnseenMessageCount++;
interactionAfterUnreadIndicator = interaction;
if (visibleUnseenMessageCount + 1 >= maxRangeSize) {
// If there are more unseen messages than can be displayed in the
// messages view, show the unread indicator at the top of the
// displayed messages.
*stop = YES;
hasMoreUnseenMessages = YES;
}
}];
if (!interactionAfterUnreadIndicator) {