Merge pull request #5157 from wikimedia/fix-saved-slide-crash

[YiR] Fixed saved articles slide crash
wikimedia · Jan 17, 2025 · ece490c · ece490c
2 parents 48a44cf + f917ee4
commit ece490c
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/ContinueReadingWidget/Info.plist b/ContinueReadingWidget/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>0</string>
 	<key>NSExtension</key>

diff --git a/NotificationServiceExtension/Info.plist b/NotificationServiceExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>

diff --git a/WMF Framework/Info.plist b/WMF Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>0</string>
 	<key>NSPrincipalClass</key>

diff --git a/Widgets/Info.plist b/Widgets/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>

diff --git a/Wikipedia Stickers/Info.plist b/Wikipedia Stickers/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>0</string>
 	<key>UIRequiredDeviceCapabilities</key>

diff --git a/Wikipedia/Code/MWKSavedPageList.m b/Wikipedia/Code/MWKSavedPageList.m
@@ -35,9 +35,14 @@ - (NSFetchRequest *)savedPageListFetchRequest {
     return request;
 }
 
-- (NSFetchRequest *)savedPageListFetchRequestForStartDate:(NSDate *)startDate endDate:(NSDate *)endDate {
+- (NSFetchRequest *)savedPageListFetchRequestForStartDate:(NSDate *)startDate endDate:(NSDate *)endDate filterNilDisplayTitles:(BOOL)filterNilDisplayTitles {
     NSFetchRequest *request = [WMFArticle fetchRequest];
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"savedDate >= %@ AND savedDate <= %@", startDate, endDate];
+
+    if (filterNilDisplayTitles) {
+        predicate = [NSPredicate predicateWithFormat:@"savedDate >= %@ AND savedDate <= %@ AND displayTitle != nil", startDate, endDate];
+    }
+
     request.predicate = predicate;
     request.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"savedDate" ascending:NO]];
     return request;
@@ -152,11 +157,11 @@ - (void)removeEntryWithURL:(NSURL *)url {
 }
 
 - (NSInteger)savedArticleCountFor:(NSDate *)startDate endDate:(NSDate *)endDate {
-    return [self.dataStore.viewContext countForFetchRequest:[self savedPageListFetchRequestForStartDate:startDate endDate:endDate] error:nil];
+    return [self.dataStore.viewContext countForFetchRequest:[self savedPageListFetchRequestForStartDate:startDate endDate:endDate filterNilDisplayTitles:NO] error:nil];
 }
 
 - (NSArray<NSString *> *)randomSavedArticleTitlesFor:(NSDate *)startDate endDate:(NSDate *)endDate {
-    NSFetchRequest *fetchRequest = [self savedPageListFetchRequestForStartDate:startDate endDate:endDate];
+    NSFetchRequest *fetchRequest = [self savedPageListFetchRequestForStartDate:startDate endDate:endDate filterNilDisplayTitles:YES];
 
     NSError *error = nil;
     NSArray<WMFArticle *> *allArticles = [self.dataStore.viewContext executeFetchRequest:fetchRequest error:&error];
@@ -176,12 +181,15 @@ - (NSInteger)savedArticleCountFor:(NSDate *)startDate endDate:(NSDate *)endDate
 
     for (NSUInteger i = 0; i < count; i++) {
         NSUInteger randomIndex = arc4random_uniform((uint32_t)mutableArticles.count);
-        [randomArticles addObject:mutableArticles[randomIndex].displayTitle];
-        [mutableArticles removeObjectAtIndex:randomIndex]; // so we do not repeat articles
+        if (mutableArticles[randomIndex].displayTitle != nil) {
+            [randomArticles addObject:mutableArticles[randomIndex].displayTitle];
+            [mutableArticles removeObjectAtIndex:randomIndex]; // so we do not repeat articles
+        } else {
+            continue;
+        }
     }
 
     return [randomArticles copy];
 }
 
-
 @end
diff --git a/Wikipedia/Experimental-Info.plist b/Wikipedia/Experimental-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Wikipedia/Local-Info.plist b/Wikipedia/Local-Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Wikipedia/Staging-Info.plist b/Wikipedia/Staging-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Wikipedia/Wikipedia-Info.plist b/Wikipedia/Wikipedia-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/WikipediaUnitTests/Info.plist b/WikipediaUnitTests/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.3</string>
+	<string>7.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>