@craft-native/android 0.0.424 → 0.0.435

package/README.md

@@ -344,6 +344,20 @@ when those features are unavailable. If neither bridge is supported, the app
 displays a clear unsupported-device error; it never silently opens a WebView.
 The native-navigation emulator fixture also relaunches the generated app and
 reads back storage and SQLite data through the compiled STX bundle.
+Before its project or emulator is removed, the native-navigation runner retains
+instrumentation reports and bounded diagnostics from the selected device in
+`CRAFT_ANDROID_NATIVE_ARTIFACTS` (default `artifacts/android-native-navigation`).
+`diagnostics.json` records each launched ADB client's parent-observed PID, exit
+code and terminating signal, including clients killed before their own startup
+logging runs. Diagnostic failures do not replace the instrumentation verdict;
+an absent `ANDROID_SERIAL` prevents device queries entirely.
+The [checkpoint interruption fixture](fixtures/checkpoint-interruption/README.md)
+additionally tests public native snapshot promises across a controlled process
+termination immediately before the real atomic file replacement. Its debug-only
+preload leaves generated storage code unchanged and renders native controls.
+The stock provider supplies only the script engine. This bounded fixture does
+not establish the complete background/quota/cancellation matrix or power-loss
+durability; original per-run receipts identify which device actually ran it.
 Support depends on the installed WebView provider, so validate on each device
 class you plan to ship. The [Android JavaScriptEngine guide](https://developer.android.com/develop/ui/views/layout/webapps/jsengine)
 documents the sandbox and device-support check.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/android",
-  "version": "0.0.424",
+  "version": "0.0.435",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/CraftNativeCapabilities.kt.template

@@ -478,7 +478,7 @@ internal class CraftNativeCapabilities(
         }
         "remove" -> {
             val file = ownedFile(args.optString(0)) ?: return failure("INVALID_ARGUMENT", "files.remove needs a file made by craft.files")
-            success(file.delete())
+            success(removeOwnedFile(file))
         }
         "download" -> download(requestToken, args)
             else -> failure("UNKNOWN_ACTION", "Unsupported Files method")
@@ -802,7 +802,7 @@ internal class CraftNativeCapabilities(
             success(copied)
         } catch (error: Exception) {
             for (index in 0 until copied.length()) {
-                copied.optJSONObject(index)?.optString("path")?.let { ownedFile(it)?.parentFile?.deleteRecursively() }
+                copied.optJSONObject(index)?.optString("path")?.let { ownedFile(it)?.let(::removeOwnedFile) }
             }
             val message = error.message ?: "The selected document could not be read"
             if (message.startsWith("CANCELLED:")) failure("CANCELLED", message.removePrefix("CANCELLED:").trim())
@@ -915,6 +915,18 @@ internal class CraftNativeCapabilities(
         return file.takeIf { it.path.startsWith(root.path + File.separator) }
     }
 
+    /** Delete only a validated owned file; never sweep siblings or the shared root. */
+    private fun removeOwnedFile(file: File): Boolean {
+        // File.delete is non-recursive and reports permission failures. Reject
+        // directories before removal; parent pruning must remain best effort.
+        if (!runCatching { file.isFile && file.delete() }.getOrDefault(false)) return false
+        runCatching {
+            val parent = file.parentFile
+            if (parent != null && parent != fileRoot.canonicalFile && parent.isDirectory) parent.delete()
+        }
+        return true
+    }
+
     private fun safeFileName(raw: String): String {
         val name = raw.substringAfterLast('/').substringAfterLast('\\').trim()
         return name.ifBlank { "file" }.replace(Regex("[\\\\/:*?\"<>|\\r\\n]"), "_")
@@ -939,7 +951,7 @@ internal class CraftNativeCapabilities(
         val files = if (data is JSONArray) (0 until data.length()).mapNotNull { data.optJSONObject(it) }
             else listOfNotNull(data as? JSONObject)
         files.forEach { file ->
-            ownedFile(file.optString("path"))?.parentFile?.deleteRecursively()
+            ownedFile(file.optString("path"))?.let(::removeOwnedFile)
         }
     }
 

package/templates/CraftNativeSounds.kt.template

@@ -57,13 +57,14 @@ internal class CraftNativeSounds(
         if (id.isBlank()) return done(failure("INVALID_ARGUMENT", "audio.play needs an id"))
         val uri = source(address)
             ?: return done(failure("INVALID_ARGUMENT", "audio.play needs an absolute http, https, file or content URL"))
-        stop(id, 0.0)
-
         val requestedVolume = options.optDouble("volume", 1.0)
         val volume = requestedVolume.takeIf { it.isFinite() }?.coerceIn(0.0, 1.0)?.toFloat()
             ?: return done(failure("INVALID_ARGUMENT", "audio.play volume must be a finite number between 0 and 1"))
         val fadeIn = options.optDouble("fadeIn", 0.0)
         if (!fadeIn.isFinite() || fadeIn < 0) return done(failure("INVALID_ARGUMENT", "audio.play fadeIn must be a non-negative finite number"))
+        // Reject malformed options before cancelling a sound with the same id.
+        // Its player, pending load and cancellation handle still belong to it.
+        stop(id, 0.0)
         val player = MediaPlayer()
         val sound = Sound(player, if (fadeIn > 0) 0f else volume, pending = done)
         sounds[id] = sound

package/templates/MainActivityNative.kt.template

@@ -9,6 +9,10 @@ import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
 import android.database.ContentObserver
 import android.content.Intent
 import android.app.PictureInPictureParams
@@ -4683,6 +4687,7 @@ class MainActivity : AppCompatActivity() {
     private val capabilityHandler = Handler(Looper.getMainLooper())
     private var hapticsEnabled = false
     private var clipboardEnabled = false
+    private var shakeEnabled = false
     internal var nativeAppState = "inactive"
         private set
     private var deliveredInitialDeepLink = false
@@ -4755,6 +4760,7 @@ class MainActivity : AppCompatActivity() {
         }.getOrDefault(JSONObject())
         hapticsEnabled = config.optBoolean("enableHaptics", false)
         clipboardEnabled = config.optBoolean("enableClipboard", false)
+        shakeEnabled = config.optBoolean("enableShakeGesture", false)
         // Normally started already by its content provider; this covers a
         // process that skipped providers (instrumentation).
         CraftCrashReporter.start(this)
@@ -6101,9 +6107,7 @@ class MainActivity : AppCompatActivity() {
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 setOnClickListener {
-                    screen.linkTargets[it]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                    val current = screen.handlers[this] ?: return@setOnClickListener
-                    send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                    dispatchNativePress(screen, it)
                 }
             }
             "Button" -> (previous as? Button ?: CraftNativePointerButton(this).apply {
@@ -6877,9 +6881,7 @@ class MainActivity : AppCompatActivity() {
                 control.isClickable = true
                 if (type in setOf("TouchableOpacity", "TouchableHighlight", "Pressable")) {
                     control.setOnClickListener {
-                        screen.linkTargets[it]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                        val current = screen.handlers[it] ?: return@setOnClickListener
-                        send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                        dispatchNativePress(screen, it)
                     }
                     control.setOnTouchListener { view, event ->
                         if (!CraftNativePointers.ownsTouch(view) && event.actionMasked != MotionEvent.ACTION_CANCEL) return@setOnTouchListener false
@@ -6907,9 +6909,7 @@ class MainActivity : AppCompatActivity() {
                                     send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
                                 }
                                 if (event.actionMasked == android.view.MotionEvent.ACTION_UP) {
-                                    screen.linkTargets[view]?.let { target -> navigateOpen(target); return@setOnTouchListener true }
-                                    val current = screen.handlers[view] ?: return@setOnTouchListener true
-                                    send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                                    dispatchNativePress(screen, view)
                                 }
                                 true
                             }
@@ -6920,9 +6920,7 @@ class MainActivity : AppCompatActivity() {
                     control.setOnTouchListener(null)
                     if (screen.pressBaseBackgrounds.containsKey(control)) control.background = screen.pressBaseBackgrounds[control]
                     control.setOnClickListener {
-                        screen.linkTargets[control]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                        val current = screen.handlers[control] ?: return@setOnClickListener
-                        send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                        dispatchNativePress(screen, control)
                     }
                 }
             } else {
@@ -8254,7 +8252,45 @@ class MainActivity : AppCompatActivity() {
         publish("APP_STATE", JSONObject().put("state", nativeAppState))
     }
 
+    // MARK: - Shake gesture (enableShakeGesture)
+
+    /// The accelerometer, watched for a shake while the app is in front, as on
+    /// iOS. Armed on resume and disarmed on pause, because the sensor is the
+    /// whole cost of this feature and nobody can shake a phone at an app they
+    /// cannot see.
+    private var lastShakeAt = 0L
+    private val shakeSensors by lazy { getSystemService(Context.SENSOR_SERVICE) as? SensorManager }
+    private val shakeListener = object : SensorEventListener {
+        override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {}
+        override fun onSensorChanged(event: SensorEvent?) {
+            val reading = event?.values ?: return
+            if (reading.size < 3) return
+            // Android reports m/s^2 with gravity included, so a phone at rest
+            // reads about 9.81. Converted to g to match the iOS threshold and
+            // the force the event carries.
+            val magnitude = kotlin.math.sqrt((reading[0] * reading[0] + reading[1] * reading[1] + reading[2] * reading[2]).toDouble()) / SensorManager.GRAVITY_EARTH
+            if (magnitude < 2.2) return
+            val now = System.currentTimeMillis()
+            // One event per gesture, not one per sample.
+            if (now - lastShakeAt < 2000L) return
+            lastShakeAt = now
+            CraftNativeHub.broadcast("CRAFT_EVENT", JSONObject().put("event", "shake").put("detail", JSONObject().put("force", magnitude)))
+        }
+    }
+
+    private fun armShakeGesture() {
+        if (!shakeEnabled) return
+        val sensor = shakeSensors?.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) ?: return
+        shakeSensors?.registerListener(shakeListener, sensor, SensorManager.SENSOR_DELAY_UI)
+    }
+
+    private fun disarmShakeGesture() {
+        if (!shakeEnabled) return
+        shakeSensors?.unregisterListener(shakeListener)
+    }
+
     override fun onPause() {
+        disarmShakeGesture()
         if (::services.isInitialized) services.pauseVoice()
         nativeAppState = "inactive"
         publish("APP_STATE", JSONObject().put("state", nativeAppState))
@@ -8314,6 +8350,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
+        armShakeGesture()
         if (::services.isInitialized) services.resumed()
     }
 
@@ -8371,6 +8408,18 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    // The authored handler owns navigation. The bridge is asynchronous, so
+    // opening the link as well cannot honor a handler's preventDefault intent.
+    private fun dispatchNativePress(screen: Screen, view: View) {
+        if (!view.isEnabled) return
+        val handler = screen.handlers[view]
+        if (handler != null) {
+            send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject()))
+        } else {
+            screen.linkTargets[view]?.let { target -> navigateOpen(target) }
+        }
+    }
+
     private fun send(screen: Screen, type: String, payload: JSONObject, correlationId: String? = null) {
         if (!screen.active) return
         val message = JSONObject().put("type", type).put("payload", payload)