Merge tag '2.26.0.26'

7 years ago · 32336e38e1
parent 74358b73f5 9b948141d0
commit 32336e38e1
3 changed files with 6 additions and 2 deletions
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.25</string>
+	<string>2.26.0.26</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
--- 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];
    }
 }
--- a/SignalShareExtension/Info.plist
+++ b/SignalShareExtension/Info.plist
@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.25</string>
+	<string>2.26.0.26</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>