zhaidi/cordova-plugin-camera-dev
zhaidi/cordova-plugin-camera-dev
1
0
Fork 0
forked from public/cordova-plugin-camera
Code Pull Requests Activity

CB-8863 correct block usage for async calls

Browse Source
This commit is contained in:
Jesse MacFadyen 2015-11-17 16:37:45 -08:00
parent 036cdfdeb8
commit 7f3a0a5483
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ios/CDVCamera.m
View File

@ -109,12 +109,14 @@ static NSString* toBase64(NSData* data) {
- (NSURL*) urlTransformer:(NSURL*)url - (NSURL*) urlTransformer:(NSURL*)url
{ {
NSURL* urlToTransform = url; NSURL* urlToTransform = url;
__weak CDVCamera* weakSelf = self;
// for backwards compatibility - we check if this property is there // for backwards compatibility - we check if this property is there
SEL sel = NSSelectorFromString(@"urlTransformer"); SEL sel = NSSelectorFromString(@"urlTransformer");
if ([self.commandDelegate respondsToSelector:sel]) { if ([self.commandDelegate respondsToSelector:sel]) {
// grab the block from the commandDelegate // grab the block from the commandDelegate
NSURL* (^urlTransformer)(NSURL*) = ((id(*)(id, SEL))objc_msgSend)(self.commandDelegate, sel); NSURL* (^urlTransformer)(NSURL*) = ((id(*)(id, SEL))objc_msgSend)(weakSelf.commandDelegate, sel);
// if block is not null, we call it // if block is not null, we call it
if (urlTransformer) { if (urlTransformer) {
urlToTransform = urlTransformer(url); urlToTransform = urlTransformer(url);
@ -172,7 +174,7 @@ static NSString* toBase64(NSData* data) {
[[[UIAlertView alloc] initWithTitle:[[NSBundle mainBundle] [[[UIAlertView alloc] initWithTitle:[[NSBundle mainBundle]
objectForInfoDictionaryKey:@"CFBundleDisplayName"] objectForInfoDictionaryKey:@"CFBundleDisplayName"]
message:NSLocalizedString(@"Access to the camera has been prohibited; please enable it in the Settings app to continue.", nil) message:NSLocalizedString(@"Access to the camera has been prohibited; please enable it in the Settings app to continue.", nil)
delegate:self delegate:weakSelf
cancelButtonTitle:NSLocalizedString(@"OK", nil) cancelButtonTitle:NSLocalizedString(@"OK", nil)
otherButtonTitles:settingsButton, nil] show]; otherButtonTitles:settingsButton, nil] show];
}); });
@ -511,14 +513,14 @@ static NSString* toBase64(NSData* data) {
NSString* mediaType = [info objectForKey:UIImagePickerControllerMediaType]; NSString* mediaType = [info objectForKey:UIImagePickerControllerMediaType];
if ([mediaType isEqualToString:(NSString*)kUTTypeImage]) { if ([mediaType isEqualToString:(NSString*)kUTTypeImage]) {
[self resultForImage:cameraPicker.pictureOptions info:info completion:^(CDVPluginResult* res) { [weakSelf resultForImage:cameraPicker.pictureOptions info:info completion:^(CDVPluginResult* res) {
[weakSelf.commandDelegate sendPluginResult:res callbackId:cameraPicker.callbackId]; [weakSelf.commandDelegate sendPluginResult:res callbackId:cameraPicker.callbackId];
weakSelf.hasPendingOperation = NO; weakSelf.hasPendingOperation = NO;
weakSelf.pickerController = nil; weakSelf.pickerController = nil;
}]; }];
} }
else { else {
result = [self resultForVideo:info]; result = [weakSelf resultForVideo:info];
[weakSelf.commandDelegate sendPluginResult:result callbackId:cameraPicker.callbackId]; [weakSelf.commandDelegate sendPluginResult:result callbackId:cameraPicker.callbackId];
weakSelf.hasPendingOperation = NO; weakSelf.hasPendingOperation = NO;
weakSelf.pickerController = nil; weakSelf.pickerController = nil;