From 476a336e3613f90b76e3a91d5bffaa098bf4e6ff Mon Sep 17 00:00:00 2001 From: Emily Janzer Date: Wed, 4 Dec 2019 11:24:18 -0800 Subject: [PATCH] Convert NetworkingModule to TurboModule Summary: Making the open source NetworkingModule TM-compatible. Reviewed By: mdvacca Differential Revision: D18770987 fbshipit-source-id: 64966f91308e31bdcf9bfa959381d4e40ccb2753 --- .../modules/network/NetworkingModule.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java index f38dcc96a5c..a584d4fbcb8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java @@ -12,10 +12,10 @@ import android.os.Bundle; import android.util.Base64; import androidx.annotation.Nullable; 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.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; @@ -51,7 +51,7 @@ import okio.Okio; /** Implements the XMLHttpRequest JavaScript interface. */ @ReactModule(name = NetworkingModule.NAME) -public final class NetworkingModule extends ReactContextBaseJavaModule { +public final class NetworkingModule extends NativeNetworkingAndroidSpec { /** * Allows to implement a custom fetching process for specific URIs. It is the handler's job to @@ -226,17 +226,19 @@ public final class NetworkingModule extends ReactContextBaseJavaModule { mResponseHandlers.remove(handler); } - @ReactMethod + @Override public void sendRequest( String method, String url, - final int requestId, + double requestIdAsDouble, ReadableArray headers, ReadableMap data, - final String responseType, - final boolean useIncrementalUpdates, - int timeout, + String responseType, + boolean useIncrementalUpdates, + double timeoutAsDouble, boolean withCredentials) { + int requestId = (int) requestIdAsDouble; + int timeout = (int) timeoutAsDouble; try { sendRequestInternal( method, @@ -644,8 +646,9 @@ public final class NetworkingModule extends ReactContextBaseJavaModule { return Arguments.fromBundle(responseHeaders); } - @ReactMethod - public void abortRequest(final int requestId) { + @Override + public void abortRequest(double requestIdAsDouble) { + int requestId = (int) requestIdAsDouble; cancelRequest(requestId); removeRequest(requestId); } @@ -666,6 +669,12 @@ public final class NetworkingModule extends ReactContextBaseJavaModule { mCookieHandler.clearCookies(callback); } + @Override + public void addListener(String eventName) {} + + @Override + public void removeListeners(double count) {} + private @Nullable MultipartBody.Builder constructMultipartBody( ReadableArray body, String contentType, int requestId) { RCTDeviceEventEmitter eventEmitter = getEventEmitter("constructMultipartBody");