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

Use promises in 'NetInfo'

Browse Source 
Reviewed By: svcscm

Differential Revision: D2938010

fb-gh-sync-id: 4a24ce680b37e49759f3325987b4b440eb033b94
shipit-source-id: 4a24ce680b37e49759f3325987b4b440eb033b94
This commit is contained in:
Satyajit Sahoo
2016-02-15 13:33:28 -08:00
committed by facebook-github-bot-9
parent ecb1643fee
commit 14ec6f011e
5 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
View File

@@ -17,15 +17,13 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.support.v4.net.ConnectivityManagerCompat;
import com.facebook.common.logging.FLog;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.common.ReactConstants;
import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
@@ -41,6 +39,8 @@ public class NetInfoModule extends ReactContextBaseJavaModule
"To use NetInfo on Android, add the following to your AndroidManifest.xml:\n" +
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />";
private static final String ERROR_MISSING_PERMISSION = "E_MISSING_PERMISSION";
private final ConnectivityManager mConnectivityManager;
private final ConnectivityManagerCompat mConnectivityManagerCompat;
private final ConnectivityBroadcastReceiver mConnectivityBroadcastReceiver;
@@ -81,25 +81,21 @@ public class NetInfoModule extends ReactContextBaseJavaModule
}
@ReactMethod
public void getCurrentConnectivity(Callback successCallback, Callback errorCallback) {
public void getCurrentConnectivity(Promise promise) {
if (mNoNetworkPermission) {
if (errorCallback == null) {
FLog.e(ReactConstants.TAG, MISSING_PERMISSION_MESSAGE);
return;
}
errorCallback.invoke(MISSING_PERMISSION_MESSAGE);
promise.reject(ERROR_MISSING_PERMISSION, MISSING_PERMISSION_MESSAGE, null);
return;
}
successCallback.invoke(createConnectivityEventMap());
promise.resolve(createConnectivityEventMap());
}
@ReactMethod
public void isConnectionMetered(Callback successCallback) {
public void isConnectionMetered(Promise promise) {
if (mNoNetworkPermission) {
FLog.e(ReactConstants.TAG, MISSING_PERMISSION_MESSAGE);
promise.reject(ERROR_MISSING_PERMISSION, MISSING_PERMISSION_MESSAGE, null);
return;
}
successCallback.invoke(mConnectivityManagerCompat.isActiveNetworkMetered(mConnectivityManager));
promise.resolve(ConnectivityManagerCompat.isActiveNetworkMetered(mConnectivityManager));
}
private void registerReceiver() {