Fix a crash during incremental update (#398)

Author: mokagio

CHANGELOG.md

@@ -46,10 +46,20 @@ _None._
 
 ### Internal Changes
 
-- Add this changelog file [#396]
+_None._
 
 _Versions below this precede the Keep a Changelog-inspired formatting._
 
+## [1.8.6](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.8.6)
+
+### Bug Fixes
+
+- Fix a crash that happens during an incremental update to a large media library. [#398]
+
+### Internal Changes
+
+- Add this changelog file [#396]
+
 ---
 ## [1.8.5](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.8.5)
 ### Changes

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.8.5)
+  - WPMediaPicker (1.8.6)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: 5a74a91e11c1047e942a65de0193f93432fc2c6d
+  WPMediaPicker: 749ebfa75fb2b6df4f5e5d9d0847e9512ad74d28
 
 PODFILE CHECKSUM: 31590cb12765a73c9da27d6ea5b8b127c095d71d
 

Pod/Classes/WPMediaPickerViewController.m

@@ -688,9 +688,6 @@ - (void)updateDataWithRemoved:(NSIndexSet *)removed inserted:(NSIndexSet *)inser
         if ([inserted count] > 0) {
             [self.collectionView insertItemsAtIndexPaths:[self indexPathsFromIndexSet:inserted section:0]];
         }
-        if ([changed count] > 0) {
-            [self.collectionView reloadItemsAtIndexPaths:[self indexPathsFromIndexSet:changed section:0]];
-        }
         for (id<WPMediaMove> move in moves) {
             [self.collectionView moveItemAtIndexPath:[NSIndexPath indexPathForItem:[move from] inSection:0]
                                          toIndexPath:[NSIndexPath indexPathForItem:[move to] inSection:0]];
@@ -699,8 +696,15 @@ - (void)updateDataWithRemoved:(NSIndexSet *)removed inserted:(NSIndexSet *)inser
             }
         }
     } completion:^(BOOL finished) {
+        if (weakSelf == nil) {
+            return;
+        }
         [weakSelf refreshSelection];
-        [weakSelf.collectionView reloadItemsAtIndexPaths:weakSelf.collectionView.indexPathsForSelectedItems];
+        // Reloading the changed items here rather than in the batch update block above to fix this issue:
+        // https://github.com/wordpress-mobile/WordPress-iOS/issues/19505
+        NSMutableSet<NSIndexPath *> *indexPaths = [NSMutableSet setWithArray:[weakSelf indexPathsFromIndexSet:changed section:0]];
+        [indexPaths addObjectsFromArray:weakSelf.collectionView.indexPathsForSelectedItems];
+        [weakSelf.collectionView reloadItemsAtIndexPaths:[indexPaths allObjects]];
     }];
 
 }

WPMediaPicker.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WPMediaPicker'
-  s.version       = '1.8.5'
+  s.version       = '1.8.6'
 
   s.summary       = 'WPMediaPicker is an iOS controller that allows capture and picking of media assets.'
   s.description   = <<-DESC