Merge pull request #414 from wordpress-mobile/fix/21102-wpmediapicker-crash-2

Avoid WPMediaPickerViewController reloadItemsAtIndexPaths crash by wrapping the call in try-catch block

Author: staskus

CHANGELOG.md

@@ -48,6 +48,12 @@ _None._
 
 _None._
 
+## 1.8.10
+
+### Bug Fixes
+
+- Fix WPMediaPickerViewController crash when reloading collection view items [#414]
+
 ## 1.8.9
 
 ### Bug Fixes

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.8.9-beta.1)
+  - WPMediaPicker (1.8.10-beta.1)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: 0ef7f4abcbff7ad20e271e7d09586e32924f5785
+  WPMediaPicker: d669d11c38f78597edcb338a58a0d973ae51912a
 
 PODFILE CHECKSUM: 31590cb12765a73c9da27d6ea5b8b127c095d71d
 

Pod/Classes/WPMediaPickerViewController.m

@@ -773,11 +773,16 @@ - (void)updateDataWithRemoved:(NSIndexSet *)removed inserted:(NSIndexSet *)inser
             return;
         }
         [weakSelf refreshSelection];
-        // 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]];
+
+        @try {
+            // 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]];
+        } @catch (NSException *exception) {
+            [weakSelf.collectionView reloadData];
+        }
     }];
 
 }

WPMediaPicker.podspec

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