Merge tag '2.26.0.26'

pull/1/head
Matthew Chen 7 years ago
commit 32336e38e1

@ -38,7 +38,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.26.0.25</string> <string>2.26.0.26</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LOGS_EMAIL</key> <key>LOGS_EMAIL</key>

@ -1596,6 +1596,10 @@ typedef enum : NSUInteger {
// //
// Otherwise, tapping on "load more messages" autoscrolls you downward which is completely wrong. // Otherwise, tapping on "load more messages" autoscrolls you downward which is completely wrong.
if (hasEarlierUnseenMessages && !self.focusMessageIdOnOpen) { if (hasEarlierUnseenMessages && !self.focusMessageIdOnOpen) {
// Ensure view items are updated before trying to scroll to the
// unread indicator.
[[OWSPrimaryStorage sharedManager] updateUIDatabaseConnectionToLatest];
[self scrollToUnreadIndicatorAnimated]; [self scrollToUnreadIndicatorAnimated];
} }
} }

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.26.0</string> <string>2.26.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.26.0.25</string> <string>2.26.0.26</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>

Loading…
Cancel
Save