public/cordova-plugin-file-opener2
public/cordova-plugin-file-opener2
9
0
Fork 0
mirror of https://gitee.com/shuto/cordova-plugin-file-opener2.git synced 2025-01-31 12:02:49 +08:00
Code Issues Projects Releases Wiki Activity

Fix double-escaping of input URI. Prefer supplied UTI if available. Modernize Objective-C usage.

Browse Source
This commit is contained in:
Seamus Campbell 2015-03-04 10:29:14 -08:00
parent 2686c86ac3
commit 755e722cc8
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ios/FileOpener2.m
View File

@ -27,58 +27,48 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#import <MobileCoreServices/MobileCoreServices.h> #import <MobileCoreServices/MobileCoreServices.h>
@implementation FileOpener2 @implementation FileOpener2
@synthesize controller = docController;
- (void) open: (CDVInvokedUrlCommand*)command { - (void) open: (CDVInvokedUrlCommand*)command {
NSString *path = [[command.arguments objectAtIndex:0] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString *path = [command.arguments objectAtIndex:0];
//NSString *uti = [command.arguments objectAtIndex:1]; NSString *uti = nil;
if (command.arguments.count > 1) {
uti = [command.arguments objectAtIndex:1];
}
CDVViewController* cont = (CDVViewController*)[ super viewController ]; CDVViewController* cont = (CDVViewController*)[ super viewController ];
if (!uti) {
NSArray *dotParts = [path componentsSeparatedByString:@"."]; NSArray *dotParts = [path componentsSeparatedByString:@"."];
NSString *fileExt = [dotParts lastObject]; NSString *fileExt = [dotParts lastObject];
//NSString *fileExt = [[dotparts lastObject] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSString *uti = (__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)fileExt, NULL); NSString *uti = (__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)fileExt, NULL);
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_main_queue(), ^{
//NSLog(@"path %@, uti:%@", path, uti); //NSLog(@"path %@, uti:%@", path, uti);
NSURL *fileURL = nil; NSURL *fileURL = [NSURL fileURLWithPath:path];
//fileURL = [NSURL URLWithString:path];
fileURL = [NSURL fileURLWithPath:path];
localFile = fileURL.path; localFile = fileURL.path;
dispatch_async(dispatch_get_main_queue(), ^{ self.controller = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
self.controller.delegate = self;
docController = [UIDocumentInteractionController interactionControllerWithURL:fileURL]; self.controller.UTI = uti;
docController.delegate = self;
docController.UTI = uti;
CGRect rect = CGRectMake(0, 0, 1000.0f, 150.0f); CGRect rect = CGRectMake(0, 0, 1000.0f, 150.0f);
CDVPluginResult* pluginResult = nil; CDVPluginResult* pluginResult = nil;
BOOL wasOpened = [docController presentOptionsMenuFromRect:rect inView:cont.view animated:NO]; BOOL wasOpened = [docController presentOptionsMenuFromRect:rect inView:cont.view animated:NO];
//presentOptionsMenuFromRect
//presentOpenInMenuFromRect
if(wasOpened) { if(wasOpened) {
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: @""]; pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: @""];
//NSLog(@"Success");
} else { } else {
NSDictionary *jsonObj = [ [NSDictionary alloc] NSDictionary *jsonObj = @{@"status" : @"9",
initWithObjectsAndKeys : @"message" : @"Could not handle UTI"};
@"9", @"status", pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
@"Could not handle UTI", @"message", messageAsDictionary:jsonObj];
nil
];
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:jsonObj];
//NSLog(@"Could not handle UTI");
} }
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId]; [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}); });
});
} }
@end @end