Skip to content

feat(ios): Added support for https urls access to local files. #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(ios): Added support for https urls access to local files. #296

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b507b1
Added support for https urls access to local files.
guylando Mar 3, 2019
6756f56
Update CDVFile.m
guylando Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/ios/CDVFile.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@ - (NSString *)filesystemNameForLocalURI:(NSURL *)uri
if (pathComponents != nil && pathComponents.count > 1) {
return [pathComponents objectAtIndex:1];
}
} else if ([[uri scheme] isEqualToString:kCDVAssetsLibraryScheme]) {
}
else if ([[uri scheme] isEqualToString:@"https"] && [uri pathComponents] != nil &&
[uri pathComponents].count > 2 && [[[uri pathComponents] objectAtIndex:1] isEqualToString:@"cdvfile"]) {
return [[uri pathComponents] objectAtIndex:2];
}
else if ([[uri scheme] isEqualToString:kCDVAssetsLibraryScheme]) {
return @"assets-library";
}
return nil;
Expand All @@ -114,7 +119,20 @@ - (NSString *)fullPathForLocalURI:(NSURL *)uri
return @"";
}
return [path substringFromIndex:slashRange.location];
} else if ([[uri scheme] isEqualToString:kCDVAssetsLibraryScheme]) {
}
else if ([[uri scheme] isEqualToString:@"https"] && [uri pathComponents] != nil &&
[uri pathComponents].count > 2 && [[[uri pathComponents] objectAtIndex:1] isEqualToString:@"cdvfile"]) {
NSString *path = [[uri path] substringFromIndex:(@"cdvfile".length + 1)];
if ([uri query]) {
path = [NSString stringWithFormat:@"%@?%@", path, [uri query]];
}
NSRange slashRange = [path rangeOfString:@"/" options:0 range:NSMakeRange(1, path.length-1)];
if (slashRange.location == NSNotFound) {
return @"";
}
return [path substringFromIndex:slashRange.location];
}
else if ([[uri scheme] isEqualToString:kCDVAssetsLibraryScheme]) {
return [[uri absoluteString] substringFromIndex:[kCDVAssetsLibraryScheme length]+2];
}
return nil;
Expand Down Expand Up @@ -142,7 +160,9 @@ @implementation CDVFilesystemURLProtocol
+ (BOOL)canInitWithRequest:(NSURLRequest*)request
{
NSURL* url = [request URL];
return [[url scheme] isEqualToString:kCDVFilesystemURLPrefix];
return [[url scheme] isEqualToString:kCDVFilesystemURLPrefix] ||
([[url scheme] isEqualToString:@"https"] && [url pathComponents] != nil &&
[url pathComponents].count > 2 && [[[url pathComponents] objectAtIndex:1] isEqualToString:@"cdvfile"]);
}

+ (NSURLRequest*)canonicalRequestForRequest:(NSURLRequest*)request
Expand Down