File tree 2 files changed +8
-2
lines changed
2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -165,7 +165,7 @@ - (NSDictionary *)constantsToExport
165
165
fileContent = [[NSData alloc ] initWithData: [data dataUsingEncoding: NSUTF8StringEncoding allowLossyConversion: YES ]];
166
166
}
167
167
else if ([[encoding lowercaseString ] isEqualToString: @" base64" ]) {
168
- fileContent = [[NSData alloc ] initWithBase64EncodedData: data options: 0 ];
168
+ fileContent = [[NSData alloc ] initWithBase64EncodedData: data options: NSDataBase64DecodingIgnoreUnknownCharacters ];
169
169
}
170
170
else if ([[encoding lowercaseString ] isEqualToString: @" uri" ]) {
171
171
NSString * orgPath = [data stringByReplacingOccurrencesOfString: FILE_PREFIX withString: @" " ];
@@ -639,7 +639,12 @@ - (NSDictionary *)constantsToExport
639
639
- (UIViewController *) documentInteractionControllerViewControllerForPreview : (UIDocumentInteractionController *) controller
640
640
{
641
641
UIWindow *window = [UIApplication sharedApplication ].keyWindow ;
642
- return window.rootViewController ;
642
+ UIViewController *currentlyPresentedView = [window.rootViewController presentedViewController ];
643
+ if (currentlyPresentedView == nil )
644
+ {
645
+ return window.rootViewController ;
646
+ }
647
+ return currentlyPresentedView;
643
648
}
644
649
645
650
# pragma mark - check expired network events
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ class RNFetchBlobFetchPolyfill {
41
41
promise = Blob . build ( body ) . then ( ( b ) => {
42
42
blobCache = b
43
43
options . headers [ 'Content-Type' ] = 'multipart/form-data;boundary=' + b . multipartBoundary
44
+ options . headers [ 'content-type' ] = 'multipart/form-data;boundary=' + b . multipartBoundary
44
45
return Promise . resolve ( RNFetchBlob . wrap ( b . _ref ) )
45
46
} )
46
47
}
You can’t perform that action at this time.
0 commit comments