UPDATE react-native-hms-nearby 5.2.1-300 (#97)

* UPDATE react-native-hms-nearby 5.2.1-300

Author: aktug

react-native-hms-nearby/README.md

@@ -47,6 +47,6 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.huawei.hms:nearby:5.0.4.302'
+    implementation 'com.huawei.hms:nearby:5.2.1.300'
 }
 

react-native-hms-nearby/android/build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

react-native-hms-nearby/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2021. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.huawei.hms.rn.nearby.modules.HMSApplication;
+import com.huawei.hms.rn.nearby.modules.HMSNearbyApplication;
 import com.huawei.hms.rn.nearby.modules.HMSDiscovery;
 import com.huawei.hms.rn.nearby.modules.HMSMessage;
 import com.huawei.hms.rn.nearby.modules.HMSTransfer;
@@ -38,7 +38,7 @@ public class HMSNearby implements ReactPackage {
     public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
 
-        modules.add(new HMSApplication(reactContext));
+        modules.add(new HMSNearbyApplication(reactContext));
         modules.add(new HMSTransfer(reactContext));
         modules.add(new HMSDiscovery(reactContext));
         modules.add(new HMSMessage(reactContext));

react-native-hms-nearby/android/gradlew

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2021. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -24,16 +24,20 @@
 import com.huawei.hms.nearby.transfer.Data;
 import com.huawei.hms.nearby.transfer.TransferEngine;
 import com.huawei.hms.nearby.transfer.TransferStateUpdate;
+import com.huawei.hms.rn.nearby.modules.HMSNearbyApplication;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.huawei.hms.rn.nearby.utils.HMSResult.ANDROID_HMS_RESTRICTED;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.BYTES_DATA_FAIL;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.ENDPOINT_ID_FAIL;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.FAILURE;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.POLICY_FAIL;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.STRING_PARAM_FAIL;
 import static com.huawei.hms.rn.nearby.utils.HMSResult.SUCCESS;
+import static com.huawei.hms.rn.nearby.utils.HMSResult.WIFI_MUST_BE_ENABLED;
+import static com.huawei.hms.rn.nearby.utils.HMSResult.WIFI_NOT_SUPPORT_SHARE;
 
 public final class HMSConstants {
     /**
@@ -44,6 +48,9 @@ public final class HMSConstants {
     public static final int POLICY_STAR = 3;
     public static final int POLICY_SHARE = 1;
     public static final int POLICY_SET = 2;
+    public static final int CHANNEL_AUTO = 1;
+    public static final int CHANNEL_HIGH_THROUGHPUT = 2;
+    public static final int CHANNEL_INSTANCE = 3;
 
     /**
      * Discovery events
@@ -101,6 +108,9 @@ public final class HMSConstants {
             put("SCAN_ON_LOST", SCAN_ON_LOST);
             put("DATA_ON_RECEIVED", DATA_ON_RECEIVED);
             put("DATA_ON_TRANSFER_UPDATE", DATA_ON_TRANSFER_UPDATE);
+            put("CHANNEL_AUTO", CHANNEL_AUTO);
+            put("CHANNEL_HIGH_THROUGHPUT", CHANNEL_HIGH_THROUGHPUT);
+            put("CHANNEL_INSTANCE", CHANNEL_INSTANCE);
         }
     });
 
@@ -165,7 +175,7 @@ public final class HMSConstants {
     });
 
     /**
-     * {@link com.huawei.hms.rn.nearby.modules.HMSApplication} module constant values exposed to RN side.
+     * {@link HMSNearbyApplication} module constant values exposed to RN side.
      */
     public static final Map<String, Object> APPLICATION_CONSTANTS = ImmutableMap.copyOf(new HashMap<String, Object>() {
         {
@@ -175,6 +185,9 @@ public final class HMSConstants {
             put("STRING_PARAM_FAIL", STRING_PARAM_FAIL.getStatusCode());
             put("ENDPOINT_ID_FAIL", ENDPOINT_ID_FAIL.getStatusCode());
             put("BYTES_DATA_FAIL", BYTES_DATA_FAIL.getStatusCode());
+            put("WIFI_NOT_SUPPORT_SHARE", WIFI_NOT_SUPPORT_SHARE.getStatusCode());
+            put("WIFI_MUST_BE_ENABLED", WIFI_MUST_BE_ENABLED.getStatusCode());
+            put("ANDROID_HMS_RESTRICTED", ANDROID_HMS_RESTRICTED.getStatusCode());
         }
     });
 

react-native-hms-nearby/android/gradlew.bat

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2021. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.

react-native-hms-nearby/android/src/main/java/com/huawei/hms/rn/nearby/HMSNearby.java

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2021. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -22,11 +22,13 @@
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.huawei.hms.nearby.Nearby;
 import com.huawei.hms.nearby.discovery.BroadcastOption;
 import com.huawei.hms.nearby.discovery.ConnectCallback;
 import com.huawei.hms.nearby.discovery.ConnectInfo;
+import com.huawei.hms.nearby.discovery.ConnectOption;
 import com.huawei.hms.nearby.discovery.ConnectResult;
 import com.huawei.hms.nearby.discovery.Policy;
 import com.huawei.hms.nearby.discovery.ScanEndpointCallback;
@@ -83,7 +85,7 @@ public void acceptConnect(String endpointId, final Promise promise) {
         }
 
         handleResult("acceptConnect",
-                Nearby.getDiscoveryEngine(getCurrentActivity()).acceptConnect(endpointId, getDataCallback()),
+                Nearby.getDiscoveryEngine(getContext()).acceptConnect(endpointId, getDataCallback()),
                 promise);
     }
 
@@ -102,7 +104,7 @@ public void disconnect(String endpointId, final Promise promise) {
             return;
         }
 
-        Nearby.getDiscoveryEngine(getCurrentActivity()).disconnect(endpointId);
+        Nearby.getDiscoveryEngine(getContext()).disconnect(endpointId);
         handleResult("disconnect", SUCCESS, promise);
     }
 
@@ -122,7 +124,7 @@ public void rejectConnect(String endpointId, final Promise promise) {
         }
 
         handleResult("rejectConnect",
-                Nearby.getDiscoveryEngine(getCurrentActivity()).rejectConnect(endpointId),
+                Nearby.getDiscoveryEngine(getContext()).rejectConnect(endpointId),
                 promise);
     }
 
@@ -143,8 +145,34 @@ public void requestConnect(String name, String endpointId, final Promise promise
             return;
         }
 
-        handleResult("rejectConnect",
-                Nearby.getDiscoveryEngine(getCurrentActivity()).requestConnect(name, endpointId, getConnectCallback()),
+        handleResult("requestConnect",
+                Nearby.getDiscoveryEngine(getContext()).requestConnect(name, endpointId, getConnectCallback()),
+                promise);
+    }
+
+    /**
+     * Sends a connection request carrying specific connection options to the remote endpoint.
+     * This is an extended method for requestConnect(String, String, ConnectCallback).
+     * Sets {@link #getConnectCallback()} : A callback listener class called during connection.
+     * Promise Resolve : Result Object
+     *
+     * @param name       Local endpoint name.
+     * @param endpointId ID of the remote endpoint.
+     * @param connectOptionMap Options Map.
+     */
+    @ReactMethod
+    public void requestConnectEx(String name, String endpointId, ReadableMap connectOptionMap, final Promise promise) {
+        startMethodExecTimer("requestConnectEx");
+
+        if (TextUtils.isEmpty(name) || TextUtils.isEmpty(endpointId)) {
+            handleResult("requestConnectEx", STRING_PARAM_FAIL, promise);
+            return;
+        }
+
+        ConnectOption connectOption = HMSUtils.getInstance().getConnectOptionFromReadableMap(connectOptionMap);
+
+        handleResult("requestConnectEx",
+                Nearby.getDiscoveryEngine(getContext()).requestConnectEx(name, endpointId,  getConnectCallback(), connectOption),
                 promise);
     }
 
@@ -173,7 +201,7 @@ public void startBroadcasting(String name, String serviceId, int policy, final P
         }
 
         handleResult("startBroadCasting",
-                Nearby.getDiscoveryEngine(getCurrentActivity()).startBroadcasting(name,
+                Nearby.getDiscoveryEngine(getContext()).startBroadcasting(name,
                         serviceId,
                         getConnectCallback(),
                         new BroadcastOption.Builder().setPolicy(broadcastPolicy).build()),
@@ -205,7 +233,7 @@ public void startScan(String serviceId, int policy, final Promise promise) {
         }
 
         handleResult("startScan",
-                Nearby.getDiscoveryEngine(getCurrentActivity()).startScan(serviceId,
+                Nearby.getDiscoveryEngine(getContext()).startScan(serviceId,
                         getScanEndpointCallback(),
                         new ScanOption.Builder().setPolicy(scanPolicy).build()),
                 promise);
@@ -218,7 +246,7 @@ public void startScan(String serviceId, int policy, final Promise promise) {
     @ReactMethod
     public void stopBroadCasting(final Promise promise) {
         startMethodExecTimer("stopBroadCasting");
-        Nearby.getDiscoveryEngine(getCurrentActivity()).stopBroadcasting();
+        Nearby.getDiscoveryEngine(getContext()).stopBroadcasting();
         handleResult("stopBroadCasting", SUCCESS, promise);
     }
 
@@ -229,7 +257,7 @@ public void stopBroadCasting(final Promise promise) {
     @ReactMethod
     public void disconnectAll(final Promise promise) {
         startMethodExecTimer("disconnectAll");
-        Nearby.getDiscoveryEngine(getCurrentActivity()).disconnectAll();
+        Nearby.getDiscoveryEngine(getContext()).disconnectAll();
         handleResult("disconnectAll", SUCCESS, promise);
     }
 
@@ -240,7 +268,7 @@ public void disconnectAll(final Promise promise) {
     @ReactMethod
     public void stopScan(final Promise promise) {
         startMethodExecTimer("stopScan");
-        Nearby.getDiscoveryEngine(getCurrentActivity()).stopScan();
+        Nearby.getDiscoveryEngine(getContext()).stopScan();
         handleResult("stopScan", SUCCESS, promise);
     }
 
@@ -260,7 +288,10 @@ public void onReceived(String endpointId, Data data) {
 
                 if (data.getType() == Data.Type.FILE) {
                     wm.putString("size", Long.toString(data.asFile().getSize()));
-                    wm.putString("fileUri", data.asFile().asJavaFile().toURI().toString());
+                    String fileUri = HMSUtils.getInstance().getFileUri(data.asFile());
+                    if(fileUri != null){
+                        wm.putString("fileUri", fileUri);
+                    }
                 } else if (data.getType() == Data.Type.BYTES) {
                     wm.putArray("data", HMSUtils.getInstance().convertByteArrayToWritableArray(data.asBytes()));
                 } else if (data.getType() == Data.Type.STREAM) {
@@ -311,6 +342,7 @@ public void onResult(String endpointId, ConnectResult connectResult) {
                 onResult.putString("endpointId", endpointId);
                 onResult.putInt("statusCode", connectResult.getStatus().getStatusCode());
                 onResult.putString("statusMessage", connectResult.getStatus().getStatusMessage());
+                onResult.putString("channelPolicy", connectResult.getChannelPolicy().toString());
                 sendEvent(CONNECT_ON_RESULT, CONNECT_CALLBACK, onResult);
             }