diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 877f051df..3ef83df24 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.26.0.25 + 2.26.0.26 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index dc8fbc9c5..8110a2bae 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1596,6 +1596,10 @@ typedef enum : NSUInteger { // // Otherwise, tapping on "load more messages" autoscrolls you downward which is completely wrong. if (hasEarlierUnseenMessages && !self.focusMessageIdOnOpen) { + // Ensure view items are updated before trying to scroll to the + // unread indicator. + [[OWSPrimaryStorage sharedManager] updateUIDatabaseConnectionToLatest]; + [self scrollToUnreadIndicatorAnimated]; } } diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 677293301..8c72d525d 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.26.0 CFBundleVersion - 2.26.0.25 + 2.26.0.26 ITSAppUsesNonExemptEncryption NSAppTransportSecurity