signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'nt/little-fixes69' into release/3.11.0

Browse Source
This commit is contained in:
Nora Trapp 2020-06-16 12:31:18 -07:00
commit abbe2ebcd0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift
View File

@ -54,7 +54,7 @@ public class ConversationMessageMapping: NSObject {
}
// After this size, we'll start unloading interactions
private let maxInteractionLimit: Int = 200
private let maxInteractionLimit: Int = 500
// oldest saved message in a conversation has an index of 0, the most recent message has index conversationCount - 1.
private var loadedIndexSet = IndexSet()

2
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -1761,7 +1761,7 @@ typedef enum : NSUInteger {
}
[self.navigationController.view layoutIfNeeded];
CGSize navControllerSize = self.navigationController.view.frame.size;
CGFloat loadThreshold = MAX(navControllerSize.width, navControllerSize.height);
CGFloat loadThreshold = MAX(navControllerSize.width, navControllerSize.height) * 3;
BOOL closeToTop = self.collectionView.contentOffset.y < loadThreshold;
if (self.showLoadOlderHeader && closeToTop) {