From 7b60a0b6d1ffc5171e49b5b9eaa4070149f1ab1a Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Wed, 4 Jun 2014 14:22:41 -0400 Subject: [PATCH] Remove deprecated symbols for iOS < 6 --- src/ios/CDVCamera.m | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m index 8c11e60..ab99297 100644 --- a/src/ios/CDVCamera.m +++ b/src/ios/CDVCamera.m @@ -151,13 +151,7 @@ static NSSet* org_apache_cordova_validArrowDirections; NSDictionary* options = [command.arguments objectAtIndex:10 withDefault:nil]; [self displayPopover:options]; } else { - SEL selector = NSSelectorFromString(@"presentViewController:animated:completion:"); - if ([self.viewController respondsToSelector:selector]) { - [self.viewController presentViewController:cameraPicker animated:YES completion:nil]; - } else { - // deprecated as of iOS >= 6.0 - [self.viewController presentModalViewController:cameraPicker animated:YES]; - } + [self.viewController presentViewController:cameraPicker animated:YES completion:nil]; } self.hasPendingOperation = YES; } @@ -266,11 +260,7 @@ static NSSet* org_apache_cordova_validArrowDirections; cameraPicker.popoverController.delegate = nil; cameraPicker.popoverController = nil; } else { - if ([cameraPicker respondsToSelector:@selector(presentingViewController)]) { - [[cameraPicker presentingViewController] dismissModalViewControllerAnimated:YES]; - } else { - [[cameraPicker parentViewController] dismissModalViewControllerAnimated:YES]; - } + [[cameraPicker presentingViewController] dismissViewControllerAnimated:YES completion:nil]; } CDVPluginResult* result = nil; @@ -386,12 +376,7 @@ static NSSet* org_apache_cordova_validArrowDirections; { CDVCameraPicker* cameraPicker = (CDVCameraPicker*)picker; - if ([cameraPicker respondsToSelector:@selector(presentingViewController)]) { - [[cameraPicker presentingViewController] dismissModalViewControllerAnimated:YES]; - } else { - [[cameraPicker parentViewController] dismissModalViewControllerAnimated:YES]; - } - // popoverControllerDidDismissPopover:(id)popoverController is called if popover is cancelled + [[cameraPicker presentingViewController] dismissViewControllerAnimated:YES completion:nil]; CDVPluginResult* result; if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {