mirror of
https://github.com/apache/cordova-plugin-file-transfer.git
synced 2024-10-06 07:42:20 +08:00
fix(ios): re-implement user agent overwrite (#268)
This closes #263 #258
This commit is contained in:
parent
2d5d3519b9
commit
64bfd154b3
@ -103,36 +103,34 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
|
||||
- (void)applyRequestHeaders:(NSDictionary*)headers toRequest:(NSMutableURLRequest*)req
|
||||
{
|
||||
[req setValue:@"XMLHttpRequest" forHTTPHeaderField:@"X-Requested-With"];
|
||||
|
||||
NSString* userAgent = [self.commandDelegate userAgent];
|
||||
if (userAgent) {
|
||||
[self.webViewEngine evaluateJavaScript:@"navigator.userAgent" completionHandler:^(NSString* userAgent, NSError* error) {
|
||||
[req setValue:userAgent forHTTPHeaderField:@"User-Agent"];
|
||||
}
|
||||
|
||||
for (NSString* headerName in headers) {
|
||||
id value = [headers objectForKey:headerName];
|
||||
if (!value || (value == [NSNull null])) {
|
||||
value = @"null";
|
||||
}
|
||||
|
||||
// First, remove an existing header if one exists.
|
||||
[req setValue:nil forHTTPHeaderField:headerName];
|
||||
|
||||
if (![value isKindOfClass:[NSArray class]]) {
|
||||
value = [NSArray arrayWithObject:value];
|
||||
}
|
||||
|
||||
// Then, append all header values.
|
||||
for (id __strong subValue in value) {
|
||||
// Convert from an NSNumber -> NSString.
|
||||
if ([subValue respondsToSelector:@selector(stringValue)]) {
|
||||
subValue = [subValue stringValue];
|
||||
for (NSString* headerName in headers) {
|
||||
id value = [headers objectForKey:headerName];
|
||||
if (!value || (value == [NSNull null])) {
|
||||
value = @"null";
|
||||
}
|
||||
if ([subValue isKindOfClass:[NSString class]]) {
|
||||
[req addValue:subValue forHTTPHeaderField:headerName];
|
||||
|
||||
// First, remove an existing header if one exists.
|
||||
[req setValue:nil forHTTPHeaderField:headerName];
|
||||
|
||||
if (![value isKindOfClass:[NSArray class]]) {
|
||||
value = [NSArray arrayWithObject:value];
|
||||
}
|
||||
|
||||
// Then, append all header values.
|
||||
for (id __strong subValue in value) {
|
||||
// Convert from an NSNumber -> NSString.
|
||||
if ([subValue respondsToSelector:@selector(stringValue)]) {
|
||||
subValue = [subValue stringValue];
|
||||
}
|
||||
if ([subValue isKindOfClass:[NSString class]]) {
|
||||
[req addValue:subValue forHTTPHeaderField:headerName];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
- (NSURLRequest*)requestForUploadCommand:(CDVInvokedUrlCommand*)command fileData:(NSData*)fileData
|
||||
|
Loading…
Reference in New Issue
Block a user