Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove GuardedAsyncTask wrapper for call.cancel() #48251

Closed
wants to merge 1 commit into from
Closed

Remove GuardedAsyncTask wrapper for call.cancel() #48251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...ative/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.facebook.common.logging.FLog;
import com.facebook.fbreact.specs.NativeNetworkingAndroidSpec;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.GuardedAsyncTask;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableArray;
Expand Down Expand Up @@ -673,14 +672,7 @@ public void abortRequest(double requestIdAsDouble) {
}

private void cancelRequest(final int requestId) {
// We have to use AsyncTask since this might trigger a NetworkOnMainThreadException, this is an
// open issue on OkHttp: https://github.com/square/okhttp/issues/869
new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
@Override
protected void doInBackgroundGuarded(Void... params) {
OkHttpCallUtil.cancelTag(mClient, Integer.valueOf(requestId));
}
}.execute();
OkHttpCallUtil.cancelTag(mClient, Integer.valueOf(requestId));
}

@ReactMethod
Expand Down
13 changes: 4 additions & 9 deletions ...ive/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import okio.Buffer
import org.assertj.core.api.Assertions.assertThat
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.MockedStatic
Expand Down Expand Up @@ -73,7 +72,7 @@ class NetworkingModuleTest {
context = mock()
whenever(context.hasActiveReactInstance()).thenReturn(true)

networkingModule = NetworkingModule(context, "", httpClient)
networkingModule = NetworkingModule(context, "", httpClient, null)

arguments = mockStatic(Arguments::class.java)
arguments.`when`<WritableArray> { Arguments.createArray() }.thenAnswer { JavaOnlyArray() }
Expand Down Expand Up @@ -477,12 +476,11 @@ class NetworkingModuleTest {
}

@Test
@Ignore("TODO: Fix me (T171890419)")
fun testCancelAllCallsInvalidate() {
val requests = 3
val calls = arrayOfNulls<Call>(requests)
val calls = mutableListOf<Call>()
for (idx in 0 until requests) {
calls[idx] = mock<Call>()
calls.add(mock<Call>())
}

whenever(httpClient.newCall(any())).thenAnswer { invocation ->
Expand All @@ -507,11 +505,9 @@ class NetworkingModuleTest {
verify(httpClient, times(3)).newCall(any())

networkingModule.invalidate()
val clientArguments = argumentCaptor<OkHttpClient>()
val requestIdArguments = argumentCaptor<Int>()
okHttpCallUtil.verify(
{ OkHttpCallUtil.cancelTag(clientArguments.capture(), requestIdArguments.capture()) },
times(3))
{ OkHttpCallUtil.cancelTag(any(), requestIdArguments.capture()) }, times(requests))

assertThat(requestIdArguments.allValues.size).isEqualTo(requests)
for (idx in 0 until requests) {
Expand All @@ -520,7 +516,6 @@ class NetworkingModuleTest {
}

@Test
@Ignore("TODO: Fix me (T171890419)")
fun testCancelSomeCallsInvalidate() {
val requests = 3
val calls = arrayOfNulls<Call>(requests)
Expand Down
Loading