one 2.7.3 → 2.7.5

package/android/src/main/java/com/margelo/nitro/one/HybridOneFonts.kt

@@ -126,11 +126,9 @@ class HybridOneFonts : HybridOneFontsSpec() {
         }
         // the resource name carries no extension; createFromFile sniffs
         // the content, so the suffix is only a label.
-        val directory = File(context.cacheDir, "one-fonts")
-        val file = File(directory, "$resourceName.ttf")
+        val file = File(File(context.cacheDir, "one-fonts"), "$resourceName.ttf")
         if (!file.isFile) {
-            directory.mkdirs()
-            file.writeBytes(bytes)
+            writeAtomically(file, bytes)
         }
         return file
     }
@@ -139,8 +137,7 @@ class HybridOneFonts : HybridOneFontsSpec() {
         val extension = url.path.substringAfterLast('.', "ttf").lowercase()
         val digest = MessageDigest.getInstance("SHA-256").digest(url.toString().toByteArray())
         val fileName = digest.joinToString("") { "%02x".format(it) } + "." + extension
-        val directory = File(context.cacheDir, "one-fonts")
-        val file = File(directory, fileName)
+        val file = File(File(context.cacheDir, "one-fonts"), fileName)
         if (file.isFile) {
             return file
         }
@@ -148,8 +145,26 @@ class HybridOneFonts : HybridOneFontsSpec() {
         if (bytes.isEmpty()) {
             throw OneNativeError("E_FONTS_DOWNLOAD", "Fonts.load: \"$name\" downloaded zero bytes")
         }
-        directory.mkdirs()
-        file.writeBytes(bytes)
+        writeAtomically(file, bytes)
         return file
     }
+
+    // concurrent loads of one font (a StrictMode double mount, or two
+    // screens) each write the cache file. writing in place truncates a file
+    // another load has already mapped for Typeface, which faults with
+    // SIGBUS, so each write goes to its own temp file and renames over the
+    // target, like the ios atomic write.
+    private fun writeAtomically(file: File, bytes: ByteArray) {
+        val directory = file.parentFile ?: throw IllegalStateException("Fonts: no cache directory")
+        directory.mkdirs()
+        val temp = File.createTempFile(file.name, ".part", directory)
+        try {
+            temp.writeBytes(bytes)
+            if (!temp.renameTo(file)) {
+                throw IllegalStateException("Fonts: could not move ${temp.name} into place")
+            }
+        } finally {
+            temp.delete()
+        }
+    }
 }

package/android/src/main/java/com/margelo/nitro/one/HybridOneNotifications.kt

@@ -1147,7 +1147,11 @@ class HybridOneNotifications :
                     context,
                     (schedule.identifier + ":" + action.identifier).hashCode(),
                     target,
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                    // the system writes a typed reply into the intent, so a
+                    // text-input action needs a mutable one (refused otherwise).
+                    PendingIntent.FLAG_UPDATE_CURRENT or
+                        if (action.textInputPlaceholder != null) PendingIntent.FLAG_MUTABLE
+                        else PendingIntent.FLAG_IMMUTABLE
                 )
             val builder =
                 androidx.core.app.NotificationCompat.Action.Builder(0, action.buttonTitle, pending)

package/android/src/main/java/com/margelo/nitro/one/HybridOneSpeechSynthesis.kt

@@ -190,10 +190,11 @@ class HybridOneSpeechSynthesis : HybridOneSpeechSynthesisSpec() {
     override fun stop(): Promise<Unit> {
         val promise = Promise<Unit>()
         main.post {
-            // queued utterances that never started get no engine callback, so
-            // they settle here; the running one settles in onStop above.
-            val dropped = waiting.toList()
+            // every utterance settles here, so isSpeaking is false once stop
+            // resolves; the engine's later onStop finds nothing live.
+            val dropped = live.values.toList() + waiting
             waiting.clear()
+            live.clear()
             engine?.stop()
             dropped.forEach {
                 it.onEvent(SpeechSynthesisEvent(SpeechSynthesisEventType.STOPPED, null))
@@ -209,9 +210,12 @@ class HybridOneSpeechSynthesis : HybridOneSpeechSynthesisSpec() {
 
     override fun resume(): Promise<Unit> = Promise.resolved(Unit)
 
+    // speaking or queued on this synthesizer, as AVSpeechSynthesizer reports
+    // on ios. the engine's own isSpeaking spans every app and stays true
+    // until its playback thread finishes the item that already sent onDone.
     override fun isSpeaking(): Promise<Boolean> {
         val promise = Promise<Boolean>()
-        main.post { promise.resolve(engine?.isSpeaking == true) }
+        main.post { promise.resolve(waiting.isNotEmpty() || live.isNotEmpty()) }
         return promise
     }
 

package/android/src/main/java/dev/onejs/onenative/OneNativeComposeNodeView.kt

@@ -9,7 +9,6 @@ import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.os.Build
-import android.view.View
 import android.view.ViewGroup
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -995,8 +994,10 @@ private class OneNativeControlledValue<T>(initial: T) {
 
 class OneNativeComposeNodeView(context: Context) : ReactViewGroup(context) {
     private val composeView =
+        // no view id: react native takes the nearest ancestor with a positive
+        // id as the react tag of a touch, so a generated id here sent taps on
+        // compose controls to whatever react view shared that number.
         ComposeView(context).apply {
-            id = View.generateViewId()
             layoutParams =
                 ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,

package/android/src/main/java/dev/onejs/onenative/OneNativePagerManager.kt

@@ -66,6 +66,8 @@ class OneNativePagerView(val reactContext: ThemedReactContext) : FrameLayout(rea
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
         isSaveEnabled = false
         pager.isSaveEnabled = false
+        // the internal recycler is not a react view; a positive id becomes a touch target tag.
+        pager.getChildAt(0).id = View.NO_ID
         pager.adapter = adapter
         addView(pager, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
         pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {

package/dist/cjs/platform/compose.android.cjs

@@ -1234,7 +1234,7 @@ function TextField(param) {
 	var syncHandle = (0, import_syncNativeState.syncHandleOf)(text);
 	var syncedText = (0, import_syncNativeState.useSyncValue)(text);
 	var controlled = (0, import_controlled.useControlled)(function(event) {
-		syncHandle === null || syncHandle === void 0 ? void 0 : syncHandle.set(event.text);
+		syncHandle === null || syncHandle === void 0 ? void 0 : syncHandle.set(syncHandle.get());
 		onTextChange(event.text);
 	}, revision);
 	var controlledFocus = (0, import_controlled.useControlled)(function(event) {

package/dist/cjs/platform/compose.android.js

@@ -1234,7 +1234,7 @@ function TextField(param) {
 	var syncHandle = (0, import_syncNativeState.syncHandleOf)(text);
 	var syncedText = (0, import_syncNativeState.useSyncValue)(text);
 	var controlled = (0, import_controlled.useControlled)(function(event) {
-		syncHandle === null || syncHandle === void 0 ? void 0 : syncHandle.set(event.text);
+		syncHandle === null || syncHandle === void 0 ? void 0 : syncHandle.set(syncHandle.get());
 		onTextChange(event.text);
 	}, revision);
 	var controlledFocus = (0, import_controlled.useControlled)(function(event) {