Skip to content

Commit e83feff

Browse files
Peter Arganyfacebook-github-bot
Peter Argany
authored andcommitted
Back out "Avoid re-encoding images when uploading local files"
Summary: This was causing an upload error in FB Dating, will need to re-land with the fix. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D29320144 fbshipit-source-id: 5d09dd2171b5696afe89cffa064947f0a0bb413d
1 parent f33e6f0 commit e83feff

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

Libraries/Network/RCTNetworking.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
- (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
4646
completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
4747

48-
- (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request handler:(id<RCTURLRequestHandler>)handler completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
49-
5048
- (void)addRequestHandler:(id<RCTNetworkingRequestHandler>)handler;
5149

5250
- (void)addResponseHandler:(id<RCTNetworkingResponseHandler>)handler;

Libraries/Network/RCTNetworking.mm

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#import <React/RCTUtils.h>
1818

1919
#import <React/RCTHTTPRequestHandler.h>
20-
#import <React/RCTFileRequestHandler.h>
2120

2221
#import "RCTNetworkPlugins.h"
2322

@@ -394,9 +393,9 @@ - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary
394393
}
395394
NSURLRequest *request = [RCTConvert NSURLRequest:query[@"uri"]];
396395
if (request) {
396+
397397
__block RCTURLRequestCancellationBlock cancellationBlock = nil;
398-
id<RCTURLRequestHandler> handler = [self.moduleRegistry moduleForName:"FileRequestHandler"];
399-
RCTNetworkTask *task = [self networkTaskWithRequest:request handler:handler completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
398+
RCTNetworkTask *task = [self networkTaskWithRequest:request completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
400399
dispatch_async(self->_methodQueue, ^{
401400
cancellationBlock = callback(error, data ? @{@"body": data, @"contentType": RCTNullIfNil(response.MIMEType)} : nil);
402401
});
@@ -677,19 +676,6 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request completionBlo
677676
return task;
678677
}
679678

680-
- (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request handler:(id<RCTURLRequestHandler>)handler completionBlock:(RCTURLRequestCompletionBlock)completionBlock
681-
{
682-
if (!handler) {
683-
// specified handler is nil, fall back to generic method
684-
return [self networkTaskWithRequest:request completionBlock:completionBlock];
685-
}
686-
RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request
687-
handler:handler
688-
callbackQueue:_methodQueue];
689-
task.completionBlock = completionBlock;
690-
return task;
691-
}
692-
693679
#pragma mark - JS API
694680

695681
RCT_EXPORT_METHOD(sendRequest:(JS::NativeNetworkingIOS::SpecSendRequestQuery &)query

0 commit comments

Comments
 (0)