react-native-gizwits-sdk-v5 1.7.0 → 1.7.1

package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt

@@ -27,8 +27,10 @@ import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONObject
@@ -167,6 +169,7 @@ data class StopUpgradeParams(
 
 class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
   private val moduleScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+  private var provideWiFiCredentialsJob: Job? = null
 
   enum class EventName(val value: String) {
     GizOTAProgressEvent("GizOTAProgressEvent"),
@@ -293,6 +296,8 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun stopProvideWiFiCredentials(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizStopProvideWiFiCredentialsParams::class.java)
     if (config !=null && device !=null) {
+      provideWiFiCredentialsJob?.cancel()
+      provideWiFiCredentialsJob = null
       moduleScope.launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.stopProvideWiFiCredentials()
@@ -335,37 +340,47 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun provideWiFiCredentials(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizProvideWiFiCredentialsParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
-        val res = when(config.type) {
-          CapacityTypes.BLE -> device.bleCapability.provideWiFiCredentials(
-            config.ssid,
-            config.password,
-            config.timeout,
-            processHandler = {
-              wiFiCredentialsEventHandler(it, device)
-            },
-            bindWithUid = config.bindWithUid ?: false
-          )
-          CapacityTypes.LAN -> device.lanCapability.provideWiFiCredentials(
-            config.ssid,
-            config.password,
-            config.timeout,
-            processHandler = {
-              wiFiCredentialsEventHandler(it, device)
-            },
-            bindWithUid = false
-          )
-          CapacityTypes.MQTT -> device.mqttCapability.provideWiFiCredentials(
-            config.ssid,
-            config.password,
-            config.timeout,
-            processHandler = {
-              wiFiCredentialsEventHandler(it, device)
-            },
-            bindWithUid = false
-          )
+      provideWiFiCredentialsJob?.cancel()
+      provideWiFiCredentialsJob = moduleScope.launch {
+        val currentJob = coroutineContext[Job]!!
+        try {
+          val res = when(config.type) {
+            CapacityTypes.BLE -> device.bleCapability.provideWiFiCredentials(
+              config.ssid,
+              config.password,
+              config.timeout,
+              processHandler = {
+                wiFiCredentialsEventHandler(it, device)
+              },
+              bindWithUid = config.bindWithUid ?: false
+            )
+            CapacityTypes.LAN -> device.lanCapability.provideWiFiCredentials(
+              config.ssid,
+              config.password,
+              config.timeout,
+              processHandler = {
+                wiFiCredentialsEventHandler(it, device)
+              },
+              bindWithUid = false
+            )
+            CapacityTypes.MQTT -> device.mqttCapability.provideWiFiCredentials(
+              config.ssid,
+              config.password,
+              config.timeout,
+              processHandler = {
+                wiFiCredentialsEventHandler(it, device)
+              },
+              bindWithUid = false
+            )
+          }
+          if (isActive) {
+            GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+          }
+        } finally {
+          if (provideWiFiCredentialsJob === currentJob) {
+            provideWiFiCredentialsJob = null
+          }
         }
-        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Gizwits",
   "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
   "main": "lib/index.js",