status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed threading bug in RCTNetworking 

Summary:
public

When uploading images, RCTHTTPFormDataHelper was sometimes accessed on the wrong thread.

Reviewed By: helouree

Differential Revision: D2709186

fb-gh-sync-id: d0a14926927d1d41f602f78a9f6892dfbdfc6ff9
This commit is contained in:
Nick Lockwood 2015-12-02 01:27:56 -08:00 committed by facebook-github-bot-1
parent 0571250521
commit 04187536d1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Libraries/Network/RCTNetworking.m
View File

@ -59,6 +59,8 @@ static NSString *RCTGenerateFormBoundary()
- (RCTURLRequestCancellationBlock)process:(NSDictionaryArray *)formData - (RCTURLRequestCancellationBlock)process:(NSDictionaryArray *)formData
callback:(RCTHTTPQueryResult)callback callback:(RCTHTTPQueryResult)callback
{ {
RCTAssertThread(_networker.methodQueue, @"process: must be called on method queue");
if (formData.count == 0) { if (formData.count == 0) {
return callback(nil, nil); return callback(nil, nil);
} }
@ -76,6 +78,8 @@ static NSString *RCTGenerateFormBoundary()
- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result
error:(NSError *)error error:(NSError *)error
{ {
RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on method queue");
if (error) { if (error) {
return _callback(error, nil); return _callback(error, nil);
} }
@ -256,7 +260,7 @@ RCT_EXPORT_MODULE()
- (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query callback: - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query callback:
(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))callback (RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))callback
{ {
RCTAssertThread(_methodQueue, @"processData: must be called on method queue"); RCTAssertThread(_methodQueue, @"processDataForHTTPQuery: must be called on method queue");
if (!query) { if (!query) {
return callback(nil, nil); return callback(nil, nil);
@ -270,7 +274,9 @@ RCT_EXPORT_MODULE()
__block RCTURLRequestCancellationBlock cancellationBlock = nil; __block RCTURLRequestCancellationBlock cancellationBlock = nil;
RCTNetworkTask *task = [self networkTaskWithRequest:request completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) { RCTNetworkTask *task = [self networkTaskWithRequest:request completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
cancellationBlock = callback(error, data ? @{@"body": data, @"contentType": RCTNullIfNil(response.MIMEType)} : nil); dispatch_async(_methodQueue, ^{
cancellationBlock = callback(error, data ? @{@"body": data, @"contentType": RCTNullIfNil(response.MIMEType)} : nil);
});
}]; }];
[task start]; [task start];