From 069934732482bf35f717a5b451f83d5012220d55 Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Wed, 25 Oct 2023 23:14:09 -0700 Subject: [PATCH] fix missed callsites for RCTNetworker requestQueue (#41195) 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 --- .../react-native/Libraries/Network/RCTNetworking.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/react-native/Libraries/Network/RCTNetworking.mm b/packages/react-native/Libraries/Network/RCTNetworking.mm index 734bf330343..e71697d34d8 100644 --- a/packages/react-native/Libraries/Network/RCTNetworking.mm +++ b/packages/react-native/Libraries/Network/RCTNetworking.mm @@ -76,7 +76,7 @@ static NSString *RCTGenerateFormBoundary() - (RCTURLRequestCancellationBlock)process:(NSArray *)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) { return callback(nil, nil); @@ -105,7 +105,7 @@ static NSString *RCTGenerateFormBoundary() - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary *)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) { return _callback(error, nil); @@ -300,7 +300,7 @@ RCT_EXPORT_MODULE() - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary *)query 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 NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL]; @@ -391,7 +391,7 @@ RCT_EXPORT_MODULE() callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary *result)) callback { - RCTAssertThread([self requestQueue], @"processDataForHTTPQuery: must be called on method queue"); + RCTAssertThread([self requestQueue], @"processDataForHTTPQuery: must be called on request queue"); if (!query) { return callback(nil, nil); @@ -520,7 +520,7 @@ RCT_EXPORT_MODULE() response:(NSURLResponse *)response 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; for (id handler in _responseHandlers) { @@ -558,7 +558,7 @@ RCT_EXPORT_MODULE() incrementalUpdates:(BOOL)incrementalUpdates 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; __block RCTNetworkTask *task; RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) {