From 2ead6335c92deb117cc3ef84d0a15db296de8dc5 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Tue, 27 Jan 2015 10:47:04 -0500 Subject: [PATCH] CB-8351 ios: Stop using now-deprecated integerValueForKey: class extension --- src/ios/CDVCamera.m | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m index 1672087..20954a2 100644 --- a/src/ios/CDVCamera.m +++ b/src/ios/CDVCamera.m @@ -173,6 +173,18 @@ static NSSet* org_apache_cordova_validArrowDirections; [self displayPopover:options]; } +- (NSInteger)integerValueForKey:(NSDictionary*)dict key:(NSString*)key defaultValue:(NSInteger)defaultValue +{ + NSInteger value = defaultValue; + + NSNumber* val = [self valueForKey:key]; // value is an NSNumber + + if (val != nil) { + value = [val integerValue]; + } + return value; +} + - (void)displayPopover:(NSDictionary*)options { NSInteger x = 0; @@ -182,11 +194,11 @@ static NSSet* org_apache_cordova_validArrowDirections; UIPopoverArrowDirection arrowDirection = UIPopoverArrowDirectionAny; if (options) { - x = [options integerValueForKey:@"x" defaultValue:0]; - y = [options integerValueForKey:@"y" defaultValue:32]; - width = [options integerValueForKey:@"width" defaultValue:320]; - height = [options integerValueForKey:@"height" defaultValue:480]; - arrowDirection = [options integerValueForKey:@"arrowDir" defaultValue:UIPopoverArrowDirectionAny]; + x = [self integerValueForKey:options key:@"x" defaultValue:0]; + y = [self integerValueForKey:options key:@"y" defaultValue:32]; + width = [self integerValueForKey:options key:@"width" defaultValue:320]; + height = [self integerValueForKey:options key:@"height" defaultValue:480]; + arrowDirection = [self integerValueForKey:options key:@"arrowDir" defaultValue:UIPopoverArrowDirectionAny]; if (![org_apache_cordova_validArrowDirections containsObject:[NSNumber numberWithUnsignedInteger:arrowDirection]]) { arrowDirection = UIPopoverArrowDirectionAny; }