Merge branch 'dev' of https://github.com/oxen-io/session-ios into seleted-photo-permission

4 years ago · 38564253ad
parent cf148fe845 009f690f1e
commit 38564253ad
2 changed files with 1 additions and 9 deletions
--- a/Session/Conversations/ConversationViewModel.m
+++ b/Session/Conversations/ConversationViewModel.m
@ -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;
--- a/SignalUtilitiesKit/Utilities/ThreadUtil.m
+++ b/SignalUtilitiesKit/Utilities/ThreadUtil.m
@ -198,14 +198,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) {