Merge branch 'hotfix/0.3.5'

Author: SergioEstevao

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (0.3.4)
+  - WPMediaPicker (0.3.5)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  WPMediaPicker: d1137b5447f1fb92cbed08742d8587b8c12c4d05
+  WPMediaPicker: 53eb0bc7b04111a99f7be64ce873c12ff9600e7d
 
 COCOAPODS: 0.37.1

Pod/Classes/WPMediaCaptureCollectionViewCell.m

@@ -48,6 +48,7 @@ - (void)dealloc
 - (void)stopCaptureOnCompletion:(void (^)(void))block
 {
     if (!self.session) {
+        dispatch_async(dispatch_get_main_queue(), block);
         return;
     }
     self.captureVideoPreviewLayer.connection.enabled = NO;
@@ -61,7 +62,9 @@ - (void)stopCaptureOnCompletion:(void (^)(void))block
 
 - (void)startCapture
 {
-    if ([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != AVAuthorizationStatusAuthorized && [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != AVAuthorizationStatusNotDetermined) {
+    if ([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != AVAuthorizationStatusAuthorized &&
+        [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != AVAuthorizationStatusNotDetermined)
+    {
         return;
     }
     dispatch_async(self.sessionQueue, ^{

Pod/Classes/WPMediaCollectionViewController.m

@@ -8,7 +8,19 @@
 @import MobileCoreServices;
 @import AVFoundation;
 
-@interface WPMediaCollectionViewController () <UIImagePickerControllerDelegate, UINavigationControllerDelegate, WPMediaGroupPickerViewControllerDelegate, UIPopoverPresentationControllerDelegate>
+typedef NS_ENUM(NSUInteger, WPMediaCollectionAlert){
+    WPMediaCollectionAlertMediaLibraryPermissionsNeeded,
+    WPMediaCollectionAlertMediaCapturePermissionsNeeded
+};
+
+@interface WPMediaCollectionViewController ()
+<
+ UIImagePickerControllerDelegate,
+ UINavigationControllerDelegate,
+ WPMediaGroupPickerViewControllerDelegate,
+ UIPopoverPresentationControllerDelegate,
+ UIAlertViewDelegate
+>
 
 @property (nonatomic, strong) UICollectionViewFlowLayout *layout;
 @property (nonatomic, strong) ALAssetsGroup *assetsGroup;
@@ -217,7 +229,25 @@ - (void)loadData
             }
             self.assetsGroup = group;
         } failureBlock:^(NSError *error) {
-            NSLog(@"Error: %@", [error localizedDescription]);
+            if ([error.domain isEqualToString:ALAssetsLibraryErrorDomain]) {
+                if (error.code == ALAssetsLibraryAccessUserDeniedError || error.code == ALAssetsLibraryAccessGloballyDeniedError) {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        NSString *otherButtonTitle = nil;
+                        if ([[self class] isiOS8OrAbove]) {
+                            otherButtonTitle = NSLocalizedString(@"Open Settings", @"Go to the settings app");
+                        }
+                        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Library", @"Title for alert when access to the media library is not granted by the user")
+                                                                       message:NSLocalizedString(@"This app needs permission to access your device media library in order to add photos and/or video to your posts. Please change the privacy settings if you wish to allow this.",  @"Explaining to the user why the app needs access to the device media library.")
+                                                                       delegate:self
+                                                                       cancelButtonTitle:NSLocalizedString(@"OK", "")
+                                                                       otherButtonTitles:otherButtonTitle,nil];
+                        alertView.tag =  WPMediaCollectionAlertMediaLibraryPermissionsNeeded;
+                        alertView.delegate = self;
+                        [alertView show];
+                    });
+                    
+                }
+            }
         }];
         return;
     }
@@ -485,11 +515,7 @@ - (void)captureMedia
             dispatch_async(dispatch_get_main_queue(), ^{
                 if (!granted)
                 {
-                        [[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Capture", @"Title for alert when access to media capture is not granted")
-                                                    message:NSLocalizedString(@"This app needs permission to access the Camera to capture new media, please change the privacy settings if you wish to allow this.", @"")
-                                                   delegate:self
-                                          cancelButtonTitle:NSLocalizedString(@"OK", nil)
-                                          otherButtonTitles:nil] show];
+                    [self showAlertAboutMediaCapturePermission];
                     return;
                 }
                 [self showMediaCaptureViewController];
@@ -499,14 +525,26 @@ - (void)captureMedia
     }
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        [[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Capture", @"Title for alert when access to media capture is not granted")
-                                    message:NSLocalizedString(@"This app needs permission to access the Camera to capture new media, please change the privacy settings if you wish to allow this.", @"")
-                                   delegate:self
-                          cancelButtonTitle:NSLocalizedString(@"OK", nil)
-                          otherButtonTitles:nil] show];
+        [self showAlertAboutMediaCapturePermission];
     });
 }
 
+- (void)showAlertAboutMediaCapturePermission
+{
+    NSString *otherButtonTitle = nil;
+    if ([[self class] isiOS8OrAbove]) {
+        otherButtonTitle = NSLocalizedString(@"Open Settings", @"Go to the settings app");
+    }
+    
+    UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Capture", @"Title for alert when access to media capture is not granted")
+                                                        message:NSLocalizedString(@"This app needs permission to access the Camera to capture new media, please change the privacy settings if you wish to allow this.", @"")
+                                                       delegate:self
+                                              cancelButtonTitle:NSLocalizedString(@"OK", nil)
+                                              otherButtonTitles:otherButtonTitle, nil];
+    alertView.tag = WPMediaCollectionAlertMediaCapturePermissionsNeeded;
+    [alertView show];
+}
+
 - (void)processMediaCaptured:(NSDictionary *)info
 {
     self.ignoreMediaNotifications = YES;
@@ -618,4 +656,35 @@ - (void)mediaGroupPickerViewControllerDidCancel:(WPMediaGroupPickerViewControlle
         [self dismissViewControllerAnimated:YES completion:nil];
     }
 }
+
+#pragma mark - UIAlertViewDelegate
+
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
+    switch (alertView.tag) {
+        case WPMediaCollectionAlertMediaLibraryPermissionsNeeded:
+        {
+            if (alertView.cancelButtonIndex == buttonIndex){
+                if ([self.picker.delegate respondsToSelector:@selector(mediaPickerControllerDidCancel:)]) {
+                    [self.picker.delegate mediaPickerControllerDidCancel:self.picker];
+                }
+            } else if (alertView.firstOtherButtonIndex == buttonIndex) {
+                if ([self.picker.delegate respondsToSelector:@selector(mediaPickerControllerDidCancel:)]) {
+                    [self.picker.delegate mediaPickerControllerDidCancel:self.picker];
+                }
+                NSURL *settingsURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+                [[UIApplication sharedApplication] openURL:settingsURL];
+            }
+        } break;
+        case WPMediaCollectionAlertMediaCapturePermissionsNeeded:
+        {
+            if (alertView.firstOtherButtonIndex == buttonIndex) {
+                NSURL *settingsURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+                [[UIApplication sharedApplication] openURL:settingsURL];
+            }
+        } break;
+        default:
+            break;
+    }
+}
+
 @end

WPMediaPicker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "0.3.4"
+  s.version          = "0.3.5"
   s.summary          = "WPMediaPicker is an iOS controller that allows capture and picking of media assets."
   s.description      = <<-DESC
                        WPMediaPicker is an iOS controller that allows capture and picking of media assets.