github/cordova-plugin-camera
github/cordova-plugin-camera
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2025-03-16 22:11:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-8032 - Camera Plugin - Add nativeURL external method support for CDVFileSystem->makeEntryForPath:isDirectory: (closes #57)

Browse Source
This commit is contained in:
Shazron Abdullah 2014-12-11 16:42:02 -08:00
parent 482f2ac2cc
commit 376bec2b96
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ios/CDVCamera.m
View File

@ -30,6 +30,7 @@
#import <ImageIO/CGImageProperties.h> #import <ImageIO/CGImageProperties.h>
#import <ImageIO/CGImageDestination.h> #import <ImageIO/CGImageDestination.h>
#import <MobileCoreServices/UTCoreTypes.h> #import <MobileCoreServices/UTCoreTypes.h>
#import <objc/message.h>
#define CDV_PHOTO_PREFIX @"cdv_photo_" #define CDV_PHOTO_PREFIX @"cdv_photo_"
@ -84,6 +85,24 @@ static NSSet* org_apache_cordova_validArrowDirections;
@synthesize hasPendingOperation, pickerController, locationManager; @synthesize hasPendingOperation, pickerController, locationManager;
- (NSURL*) urlTransformer:(NSURL*)url
{
NSURL* urlToTransform = url;
// for backwards compatibility - we check if this property is there
SEL sel = NSSelectorFromString(@"urlTransformer");
if ([self.commandDelegate respondsToSelector:sel]) {
// grab the block from the commandDelegate
NSURL* (^urlTransformer)(NSURL*) = ((id(*)(id, SEL))objc_msgSend)(self.commandDelegate, sel);
// if block is not null, we call it
if (urlTransformer) {
urlToTransform = urlTransformer(url);
}
}
return urlToTransform;
}
- (BOOL)usesGeolocation - (BOOL)usesGeolocation
{ {
id useGeo = [self.commandDelegate.settings objectForKey:[@"CameraUsesGeolocation" lowercaseString]]; id useGeo = [self.commandDelegate.settings objectForKey:[@"CameraUsesGeolocation" lowercaseString]];
@ -336,7 +355,8 @@ static NSSet* org_apache_cordova_validArrowDirections;
switch (options.destinationType) { switch (options.destinationType) {
case DestinationTypeNativeUri: case DestinationTypeNativeUri:
{ {
NSString* nativeUri = [(NSURL*)[info objectForKey:UIImagePickerControllerReferenceURL] absoluteString]; NSURL* url = (NSURL*)[info objectForKey:UIImagePickerControllerReferenceURL];
NSString* nativeUri = [[self urlTransformer:url] absoluteString];
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nativeUri]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nativeUri];
saveToPhotoAlbum = NO; saveToPhotoAlbum = NO;
} }
@ -355,7 +375,7 @@ static NSSet* org_apache_cordova_validArrowDirections;
if (![data writeToFile:filePath options:NSAtomicWrite error:&err]) { if (![data writeToFile:filePath options:NSAtomicWrite error:&err]) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]];
} else { } else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[[NSURL fileURLWithPath:filePath] absoluteString]]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[[self urlTransformer:[NSURL fileURLWithPath:filePath]] absoluteString]];
} }
} }
} }
@ -562,7 +582,7 @@ static NSSet* org_apache_cordova_validArrowDirections;
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]];
} }
else { else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[[NSURL fileURLWithPath:filePath] absoluteString]]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[[self urlTransformer:[NSURL fileURLWithPath:filePath]] absoluteString]];
} }
} }
break; break;