kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-08 22:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove WebWorker support from NetworkingModule

Browse Source 
Reviewed By: AaaChiuuu

Differential Revision: D4929251

fbshipit-source-id: fa07bfea64e6f79fd7b8c19889a26caec03cd421
This commit is contained in:
Pieter De Baets
2017-04-25 05:29:43 -07:00
committed by Facebook Github Bot
parent 3e08a28987
commit ea93577ff2
2 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
View File

@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
import android.util.Base64;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ExecutorToken;
import com.facebook.react.bridge.GuardedAsyncTask;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -52,7 +51,7 @@ import okio.ByteString;
/**
* Implements the XMLHttpRequest JavaScript interface.
*/
@ReactModule(name = NetworkingModule.NAME, supportsWebWorkers = true)
@ReactModule(name = NetworkingModule.NAME)
public final class NetworkingModule extends ReactContextBaseJavaModule {
protected static final String NAME = "Networking";
@@ -160,7 +159,6 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
* @param timeout value of 0 results in no timeout
*/
public void sendRequest(
final ExecutorToken executorToken,
String method,
String url,
final int requestId,
@@ -176,7 +174,7 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
requestBuilder.tag(requestId);
}
final RCTDeviceEventEmitter eventEmitter = getEventEmitter(executorToken);
final RCTDeviceEventEmitter eventEmitter = getEventEmitter();
OkHttpClient.Builder clientBuilder = mClient.newBuilder();
if (!withCredentials) {
@@ -303,7 +301,7 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
}
ReadableArray parts = data.getArray(REQUEST_BODY_KEY_FORMDATA);
MultipartBody.Builder multipartBuilder =
constructMultipartBody(executorToken, parts, contentType, requestId);
constructMultipartBody(parts, contentType, requestId);
if (multipartBuilder == null) {
return;
}
@@ -448,7 +446,7 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
}
@ReactMethod
public void abortRequest(ExecutorToken executorToken, final int requestId) {
public void abortRequest(final int requestId) {
cancelRequest(requestId);
removeRequest(requestId);
}
@@ -465,23 +463,15 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
}
@ReactMethod
public void clearCookies(
ExecutorToken executorToken,
com.facebook.react.bridge.Callback callback) {
public void clearCookies(com.facebook.react.bridge.Callback callback) {
mCookieHandler.clearCookies(callback);
}
@Override
public boolean supportsWebWorkers() {
return true;
}
private @Nullable MultipartBody.Builder constructMultipartBody(
ExecutorToken ExecutorToken,
ReadableArray body,
String contentType,
int requestId) {
RCTDeviceEventEmitter eventEmitter = getEventEmitter(ExecutorToken);
RCTDeviceEventEmitter eventEmitter = getEventEmitter();
MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
multipartBuilder.setType(MediaType.parse(contentType));
@@ -574,8 +564,7 @@ public final class NetworkingModule extends ReactContextBaseJavaModule {
return headersBuilder.build();
}
private RCTDeviceEventEmitter getEventEmitter(ExecutorToken ExecutorToken) {
return getReactApplicationContext()
.getJSModule(ExecutorToken, RCTDeviceEventEmitter.class);
private RCTDeviceEventEmitter getEventEmitter() {
return getReactApplicationContext().getJSModule(RCTDeviceEventEmitter.class);
}
}