Fix image file size when uploaded from ios #10297
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // | ||
| // OriginImageRequestHandler.h | ||
| // NewExpensify | ||
| // | ||
| // Created by ntdiary on 2022/8/8. | ||
| // | ||
|
|
||
| #import <React/RCTURLRequestHandler.h> | ||
|
|
||
| @interface OriginImageRequestHandler : NSObject <RCTURLRequestHandler> | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| // | ||
| // OriginImageRequestHandler.mm | ||
| // NewExpensify | ||
| // | ||
| // Created by ntdiary on 2022/8/8. | ||
| // | ||
| // Use this handler to parse images uri returned by react-native-image-picker | ||
| // instead of the default `RCTImageLoader.mm` | ||
| // See https://github.com/facebook/react-native/issues/33760#issuecomment-1196562161 | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <ReactCommon/RCTTurboModule.h> | ||
|
|
||
| #import <MobileCoreServices/MobileCoreServices.h> | ||
| #import <React/RCTUtils.h> | ||
|
|
||
| #import "OriginImageRequestHandler.h" | ||
|
|
||
| @interface OriginImageRequestHandler() <RCTTurboModule> | ||
|
|
||
| @end | ||
|
|
||
| @implementation OriginImageRequestHandler | ||
| { | ||
| NSOperationQueue *_fileQueue; | ||
| } | ||
|
|
||
| RCT_EXPORT_MODULE() | ||
|
|
||
| - (void)invalidate | ||
| { | ||
| [_fileQueue cancelAllOperations]; | ||
| _fileQueue = nil; | ||
| } | ||
|
|
||
|
Comment on lines
+23
to
+35
There was a problem hiding this comment. Why is this handler needed? There was a problem hiding this comment. in my proposal, the issue root cause is
We need to use this handler to upload the image file instead of the default |
||
| /** | ||
| * Only used for parsing the png/jpg image in the application home directory | ||
| */ | ||
| - (BOOL)canHandleRequest:(NSURLRequest *)request | ||
| { | ||
| return [request.URL.scheme caseInsensitiveCompare:@"file"] == NSOrderedSame | ||
| && RCTIsLocalAssetURL(request.URL) | ||
| && !RCTIsBundleAssetURL(request.URL); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Send a network request and call the delegate with the response data. | ||
| */ | ||
| - (NSOperation *)sendRequest:(NSURLRequest *)request | ||
| withDelegate:(id<RCTURLRequestDelegate>)delegate | ||
| { | ||
| // Lazy setup | ||
| if (!_fileQueue) { | ||
| _fileQueue = [NSOperationQueue new]; | ||
| _fileQueue.maxConcurrentOperationCount = 4; | ||
| } | ||
|
|
||
| __weak __block NSBlockOperation *weakOp; | ||
| __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{ | ||
|
|
||
| // Get content length | ||
| NSError *error = nil; | ||
| NSFileManager *fileManager = [NSFileManager new]; | ||
| NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:request.URL.path error:&error]; | ||
| if (!fileAttributes) { | ||
| [delegate URLRequest:weakOp didCompleteWithError:error]; | ||
| return; | ||
| } | ||
|
|
||
| // Get mime type | ||
| NSString *fileExtension = [request.URL pathExtension]; | ||
| NSString *UTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag( | ||
| kUTTagClassFilenameExtension, (__bridge CFStringRef)fileExtension, NULL); | ||
| NSString *contentType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass( | ||
| (__bridge CFStringRef)UTI, kUTTagClassMIMEType); | ||
|
|
||
| // Send response | ||
| NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL | ||
| MIMEType:contentType | ||
| expectedContentLength:[fileAttributes[NSFileSize] ?: @-1 integerValue] | ||
| textEncodingName:nil]; | ||
|
|
||
| [delegate URLRequest:weakOp didReceiveResponse:response]; | ||
|
|
||
| // Load data | ||
| NSData *data = [NSData dataWithContentsOfURL:request.URL | ||
| options:NSDataReadingMappedIfSafe | ||
| error:&error]; | ||
| if (data) { | ||
| [delegate URLRequest:weakOp didReceiveData:data]; | ||
| } | ||
| [delegate URLRequest:weakOp didCompleteWithError:error]; | ||
| }]; | ||
|
|
||
| weakOp = op; | ||
| [_fileQueue addOperation:op]; | ||
| return op; | ||
| } | ||
|
|
||
| /** | ||
| * Cancel the request | ||
| */ | ||
| - (void)cancelRequest:(NSOperation *)op | ||
| { | ||
| [op cancel]; | ||
| } | ||
|
|
||
| /** | ||
| * Should return nullptr. This method may be used later to support C++ TurboModules. | ||
| * See https://reactnative.dev/docs/new-architecture-app-modules-ios | ||
| */ | ||
| - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule: | ||
| (const facebook::react::ObjCTurboModule::InitParams &)params | ||
| { | ||
| return nullptr; | ||
| } | ||
|
|
||
| /** | ||
| * Should have higher priority than RCTImageLoader.mm | ||
| */ | ||
| - (float)handlerPriority | ||
| { | ||
| return 4; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| Class OriginImageRequestHandlerCls(void) { | ||
| return OriginImageRequestHandler.class; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just a header file created by convention.