Skip to content

Commit

Permalink
fix missed callsites for RCTNetworker requestQueue
Browse files Browse the repository at this point in the history
Summary:
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
  • Loading branch information
philIip authored and facebook-github-bot committed Oct 26, 2023
1 parent 97647d1 commit 09e062a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions packages/react-native/Libraries/Network/RCTNetworking.mm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ @implementation RCTHTTPFormDataHelper {

- (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) {
return callback(nil, nil);
Expand Down Expand Up @@ -105,7 +105,7 @@ - (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData ca

- (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) {
return _callback(error, nil);
Expand Down Expand Up @@ -300,7 +300,7 @@ - (void)invalidate
- (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)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];
Expand Down Expand Up @@ -391,7 +391,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *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);
Expand Down Expand Up @@ -520,7 +520,7 @@ - (void)sendData:(NSData *)data
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<RCTNetworkingResponseHandler> handler in _responseHandlers) {
Expand Down Expand Up @@ -558,7 +558,7 @@ - (void)sendRequest:(NSURLRequest *)request
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) {
Expand Down

0 comments on commit 09e062a

Please sign in to comment.