Merge pull request #88 from wordpress-mobile/issue/73_fix_crash_when_adding_photo

Issue/73 fix crash when adding photo

Author: Sérgio Estêvão

Pod/Classes/WPMediaCollectionViewCell.m

@@ -35,6 +35,7 @@ - (void)prepareForReuse
     [self setImage:nil];
     [self setCaption:@""];
     [self setPosition:NSNotFound];
+    [self setSelected:NO];
 }
 
 - (void)commonInit

Pod/Classes/WPMediaCollectionViewController.m

@@ -237,6 +237,9 @@ - (void)refreshData
             [self.collectionView setContentOffset:CGPointMake(0, - [[self topLayoutGuide] length] - (self.refreshControl.frame.size.height)) animated:YES];
             [self.refreshControl beginRefreshing];
         }
+        // NOTE: Sergio Estevao (2015-11-19)
+        // Clean all assets and refresh collection view when the group was changed
+        // This avoid to see data from previous group while the new one is loading.
         [self.collectionView reloadData];
     }
     self.collectionView.allowsSelection = NO;
@@ -657,13 +660,15 @@ - (void)showAlertAboutMediaCapturePermission
 
 - (void)processMediaCaptured:(NSDictionary *)info
 {
+    NSInteger mediaItemsBefore = [self.dataSource numberOfAssets];
     self.ignoreMediaTimestamp = [NSDate timeIntervalSinceReferenceDate];
     WPMediaAddedBlock completionBlock = ^(id<WPMediaAsset> media, NSError *error) {
         if (error || !media) {
-            NSLog(@"%@", error);
+            NSLog(@"Adding media failed: %@", [error localizedDescription]);
             return;
         }
-        [self addMedia:media];
+        NSInteger mediaItemsAfter = [self.dataSource numberOfAssets];
+        [self addMedia:media animated:mediaItemsAfter != mediaItemsBefore];
     };
     if ([info[UIImagePickerControllerMediaType] isEqual:(NSString *)kUTTypeImage]) {
         UIImage *image = (UIImage *)info[UIImagePickerControllerOriginalImage];
@@ -675,7 +680,7 @@ - (void)processMediaCaptured:(NSDictionary *)info
     }
 }
 
-- (void)addMedia:(id<WPMediaAsset>)asset
+- (void)addMedia:(id<WPMediaAsset>)asset animated:(BOOL)animated
 {
     BOOL willBeSelected = YES;
     if ([self.picker.delegate respondsToSelector:@selector(mediaPickerController:shouldSelectAsset:)]) {
@@ -687,21 +692,21 @@ - (void)addMedia:(id<WPMediaAsset>)asset
     } else {
         [self.selectedAssets addObject:asset];
     }
-
     NSUInteger insertPosition = [self showMostRecentFirst] ? 1 : [self.dataSource numberOfAssets]-1;
+    if (animated){
+        [self.collectionView insertItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:insertPosition inSection:0]]];
 
-    [self.collectionView insertItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:insertPosition inSection:0]]];
-
-    if ( ![self showMostRecentFirst] ){
-        NSUInteger reloadPosition = [self.dataSource numberOfAssets];
-        [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:reloadPosition inSection:0]]];
-    } else {
-        NSUInteger reloadPosition = MIN([self.dataSource numberOfAssets], 2);
-        [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:reloadPosition inSection:0]]];
-    }
-    if (!self.showMostRecentFirst) {
-        [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:[self.dataSource numberOfAssets] inSection:0]
-                                atScrollPosition:UICollectionViewScrollPositionBottom animated:YES];
+        if ( ![self showMostRecentFirst] ){
+            NSUInteger reloadPosition = [self.dataSource numberOfAssets];
+            [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:reloadPosition inSection:0]]];
+        } else {
+            NSUInteger reloadPosition = MIN([self.dataSource numberOfAssets], 2);
+            [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:reloadPosition inSection:0]]];
+        }
+        if (!self.showMostRecentFirst) {
+            [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:[self.dataSource numberOfAssets] inSection:0]
+                                    atScrollPosition:UICollectionViewScrollPositionBottom animated:YES];
+        }
     }
 
     if (!willBeSelected) {