craft-native 0.0.90 → 0.0.92

package/dist/android/templates/CraftHealthConnect.kt.template

@@ -35,7 +35,10 @@ class CraftHealthConnect(
     }
 
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private val closed = java.util.concurrent.atomic.AtomicBoolean(false)
     private val permissionContract = PermissionController.createRequestPermissionResultContract()
+    private val authorizationPending = java.util.concurrent.atomic.AtomicBoolean(false)
+    @Volatile
     private var pendingPermissions: Set<String> = emptySet()
 
     private val client: HealthConnectClient?
@@ -46,7 +49,13 @@ class CraftHealthConnect(
         }
 
     fun requestAuthorization(typesJson: String) {
-        val requested = permissionsFor(JSONArray(typesJson))
+        val requested = try {
+            permissionsFor(JSONArray(typesJson)).also {
+                require(it.isNotEmpty()) { "At least one Health Connect permission type is required" }
+            }
+        } catch (error: Exception) {
+            return reject("_craftFitnessAuthReject", error.message ?: "Health permissions are invalid")
+        }
         val healthClient = client ?: return reject("_craftFitnessAuthReject", "Health Connect is unavailable or requires an update")
         scope.launch {
             try {
@@ -55,9 +64,25 @@ class CraftHealthConnect(
                     resolve("_craftFitnessAuthResolve", "true")
                 } else {
                     pendingPermissions = requested
+                    authorizationPending.set(true)
+                    if (closed.get()) {
+                        authorizationPending.set(false)
+                        pendingPermissions = emptySet()
+                        return@launch
+                    }
                     activity.runOnUiThread {
-                        val intent = permissionContract.createIntent(activity, requested)
-                        activity.startActivityForResult(intent, PERMISSION_REQUEST_CODE)
+                        if (closed.get()) return@runOnUiThread
+                        try {
+                            val intent = permissionContract.createIntent(activity, requested)
+                            activity.startActivityForResult(intent, PERMISSION_REQUEST_CODE)
+                        } catch (error: Exception) {
+                            authorizationPending.set(false)
+                            pendingPermissions = emptySet()
+                            reject(
+                                "_craftFitnessAuthReject",
+                                error.message ?: "Health permissions could not be requested"
+                            )
+                        }
                     }
                 }
             } catch (error: Exception) {
@@ -68,9 +93,17 @@ class CraftHealthConnect(
 
     fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
         if (requestCode != PERMISSION_REQUEST_CODE) return false
-        val granted = permissionContract.parseResult(resultCode, data)
-        resolve("_craftFitnessAuthResolve", if (granted.containsAll(pendingPermissions)) "true" else "false")
+        if (closed.get()) return true
+        if (!authorizationPending.compareAndSet(true, false)) return true
+        val requested = pendingPermissions
         pendingPermissions = emptySet()
+        val granted = try {
+            permissionContract.parseResult(resultCode, data)
+        } catch (error: Exception) {
+            reject("_craftFitnessAuthReject", error.message ?: "Health permission result could not be read")
+            return true
+        }
+        resolve("_craftFitnessAuthResolve", if (granted.containsAll(requested)) "true" else "false")
         return true
     }
 
@@ -135,7 +168,7 @@ class CraftHealthConnect(
                     endTime = end,
                     endZoneOffset = zone,
                     exerciseType = exerciseType,
-                    title = "WildLoop",
+                    title = activity.applicationInfo.loadLabel(activity.packageManager).toString(),
                     metadata = Metadata.manualEntry(clientRecordId = activityId)
                 ))
                 val distance = data.optDouble("distanceMeters", 0.0)
@@ -166,6 +199,9 @@ class CraftHealthConnect(
     }
 
     fun close() {
+        closed.set(true)
+        authorizationPending.set(false)
+        pendingPermissions = emptySet()
         scope.cancel()
     }
 
@@ -183,13 +219,16 @@ class CraftHealthConnect(
                     permissions.add(HealthPermission.getWritePermission(ActiveCaloriesBurnedRecord::class))
                     permissions.add(HealthPermission.getWritePermission(DistanceRecord::class))
                 }
+                else -> throw IllegalArgumentException("Unsupported Health Connect permission type: ${types.optString(index)}")
             }
         }
         return permissions
     }
 
     private fun resolve(callback: String, json: String) {
+        if (closed.get()) return
         activity.runOnUiThread {
+            if (closed.get()) return@runOnUiThread
             webView.evaluateJavascript("window.$callback && window.$callback($json)", null)
         }
     }

package/dist/android/templates/CraftHealthConnectStub.kt.template

@@ -9,6 +9,8 @@ class CraftHealthConnect(
     private val activity: Activity,
     private val webView: WebView
 ) {
+    private val closed = java.util.concurrent.atomic.AtomicBoolean(false)
+
     fun requestAuthorization(typesJson: String) = reject("_craftFitnessAuthReject")
 
     fun getData(type: String, startDate: Long, endDate: Long) = reject("_craftFitnessDataReject")
@@ -17,10 +19,14 @@ class CraftHealthConnect(
 
     fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean = false
 
-    fun close() = Unit
+    fun close() {
+        closed.set(true)
+    }
 
     private fun reject(callback: String) {
+        if (closed.get()) return
         activity.runOnUiThread {
+            if (closed.get()) return@runOnUiThread
             val reason = JSONObject.quote("Health Connect is disabled")
             webView.evaluateJavascript("window.$callback && window.$callback($reason)", null)
         }