Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix missed callsites for RCTNetworker requestQueue (#41195)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/41195

Changelog: [Internal]

in PR 41183 , i introduced a new method to retrieve the RCTNetworker's execution queue. i missed updating a few of these asserts

Reviewed By: fkgozali

Differential Revision: D50680549

fbshipit-source-id: ac88382e13ade4434abbb7d6cbca168117df492e
This commit is contained in:
Phillip Pan
2023-10-25 23:14:09 -07:00
committed by Facebook GitHub Bot
parent 97647d1184
commit 0699347324
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/Libraries/Network/RCTNetworking.mm
+6 -6
View File
@@ -76,7 +76,7 @@ static NSString *RCTGenerateFormBoundary()
- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback - (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback
{ {
RCTAssertThread(_networker.methodQueue, @"process: must be called on method queue"); RCTAssertThread([_networker requestQueue], @"process: must be called on request queue");
if (formData.count == 0) { if (formData.count == 0) {
return callback(nil, nil); return callback(nil, nil);
@@ -105,7 +105,7 @@ static NSString *RCTGenerateFormBoundary()
- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error
{ {
RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on method queue"); RCTAssertThread([_networker requestQueue], @"handleResult: must be called on request queue");
if (error) { if (error) {
return _callback(error, nil); return _callback(error, nil);
@@ -300,7 +300,7 @@ RCT_EXPORT_MODULE()
- (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query
completionBlock:(void (^)(NSURLRequest *request))block completionBlock:(void (^)(NSURLRequest *request))block
{ {
RCTAssertThread([self requestQueue], @"buildRequest: must be called on method queue"); RCTAssertThread([self requestQueue], @"buildRequest: must be called on request queue");
NSURL *URL = [RCTConvert NSURL:query[@"url"]]; // this is marked as nullable in JS, but should not be null NSURL *URL = [RCTConvert NSURL:query[@"url"]]; // this is marked as nullable in JS, but should not be null
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
@@ -391,7 +391,7 @@ RCT_EXPORT_MODULE()
callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result)) callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))
callback callback
{ {
RCTAssertThread([self requestQueue], @"processDataForHTTPQuery: must be called on method queue"); RCTAssertThread([self requestQueue], @"processDataForHTTPQuery: must be called on request queue");
if (!query) { if (!query) {
return callback(nil, nil); return callback(nil, nil);
@@ -520,7 +520,7 @@ RCT_EXPORT_MODULE()
response:(NSURLResponse *)response response:(NSURLResponse *)response
forTask:(RCTNetworkTask *)task forTask:(RCTNetworkTask *)task
{ {
RCTAssertThread([self requestQueue], @"sendData: must be called on method queue"); RCTAssertThread([self requestQueue], @"sendData: must be called on request queue");
id responseData = nil; id responseData = nil;
for (id<RCTNetworkingResponseHandler> handler in _responseHandlers) { for (id<RCTNetworkingResponseHandler> handler in _responseHandlers) {
@@ -558,7 +558,7 @@ RCT_EXPORT_MODULE()
incrementalUpdates:(BOOL)incrementalUpdates incrementalUpdates:(BOOL)incrementalUpdates
responseSender:(RCTResponseSenderBlock)responseSender responseSender:(RCTResponseSenderBlock)responseSender
{ {
RCTAssertThread([self requestQueue], @"sendRequest: must be called on method queue"); RCTAssertThread([self requestQueue], @"sendRequest: must be called on request queue");
__weak __typeof(self) weakSelf = self; __weak __typeof(self) weakSelf = self;
__block RCTNetworkTask *task; __block RCTNetworkTask *task;
RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) { RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) {