Merge branch 'dejal' into dejal-alpha

samuelclay · Dec 30, 2024 · 0933da3 · 0933da3
2 parents 9a818dd + f4ead3e
commit 0933da3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/clients/ios/Classes/FeedDetailObjCViewController.m b/clients/ios/Classes/FeedDetailObjCViewController.m
@@ -1943,7 +1943,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         NSInteger location = storiesCollection.locationOfActiveStory;
         NSIndexPath *oldIndexPath = [NSIndexPath indexPathForRow:location inSection:0];
 
-        if (![oldIndexPath isEqual:indexPath]) {
+        if (location >= 0 && ![oldIndexPath isEqual:indexPath]) {
             [self tableView:tableView deselectRowAtIndexPath:oldIndexPath animated:YES];
         }
 

diff --git a/clients/ios/Classes/StoryPagesObjCViewController.m b/clients/ios/Classes/StoryPagesObjCViewController.m
@@ -1109,7 +1109,7 @@ - (void)changePage:(NSInteger)pageIndex animated:(BOOL)animated {
         [self applyNewIndex:pageIndex pageController:currentPage];
         [self setStoryFromScroll];
     } else {
-        [self.scrollView scrollRectToVisible:frame animated:animated];
+        [self.scrollView scrollRectToVisible:frame animated:animated && self.currentPage.pageIndex > -2];
         if (!animated) {
             [self setStoryFromScroll];
         }

diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
@@ -6132,7 +6132,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 295;
+				CURRENT_PROJECT_VERSION = 296;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -6149,7 +6149,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LAUNCH_SCREEN_NAME = LaunchScreen;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 13.1.5;
+				MARKETING_VERSION = 13.1.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PROVISIONING_PROFILE = "";
@@ -6187,7 +6187,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 295;
+				CURRENT_PROJECT_VERSION = 296;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -6203,7 +6203,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LAUNCH_SCREEN_NAME = LaunchScreen;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 13.1.5;
+				MARKETING_VERSION = 13.1.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = "-ObjC";

diff --git a/clients/ios/Releases/13.1.md b/clients/ios/Releases/13.1.md
@@ -6,6 +6,11 @@ A reverse-chronological list of changes for this minor version and its bug-fix r
 Note: changes apply to both iOS and Mac editions, unless otherwise noted.
 
 
+## Version 13.1.6 (build 296) ##
+
+- Fixed the wrong story sometimes being selected when first opening the app.
+
+
 ## Version 13.1.5 (build 295) ##
 
 - Fixed cached images not rendering on iOS 18 and macOS Sequoia.

diff --git a/clients/ios/TestFlight/WhatToTest.en-US.txt b/clients/ios/TestFlight/WhatToTest.en-US.txt
@@ -1,2 +1,2 @@
-- Fixed cached images not rendering on iOS 18 and macOS Sequoia.
+- Fixed the wrong story sometimes being selected when first opening the app.
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		- Fixed cached images not rendering on iOS 18 and macOS Sequoia.
		- Fixed the wrong story sometimes being selected when first opening the app.