@craft-native/android 0.0.225 → 0.0.226

package/package.json

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

package/templates/CraftNativeImageCache.kt.template

@@ -100,6 +100,7 @@ internal class CraftNativeImageCache(
             true
         }
         catch (error: Exception) { false }
+        catch (error: OutOfMemoryError) { false }
         finally { staging?.delete() }
     }
 

package/templates/CraftNativeServices.kt.template

@@ -120,6 +120,7 @@ internal class CraftNativeServices(
                         done(success(CraftNativeMedia.prune(context, (0 until keep.length()).map { keep.optString(it) })))
                     }
                     "usage" -> done(success(CraftNativeMedia.usage(context)))
+                    "clear" -> done(success(CraftNativeMedia.clear(context)))
                     else -> done(failure("UNKNOWN_ACTION", "Unsupported Media method"))
                 }
                 "Background" -> {

package/templates/CraftNativeShell.kt.template

@@ -1021,7 +1021,8 @@ internal object CraftNativeSymbols {
  * A native Video given an address with a copy here plays the copy.
  */
 internal object CraftNativeMedia {
-    private val inFlight = HashMap<String, MutableList<(CraftNativeCapabilityResult) -> Unit>>()
+    private data class Flight(val id: String, val waiting: MutableList<(CraftNativeCapabilityResult) -> Unit>)
+    private val inFlight = HashMap<String, Flight>()
     private val executor = Executors.newFixedThreadPool(2)
     private val main = Handler(Looper.getMainLooper())
 
@@ -1054,12 +1055,12 @@ internal object CraftNativeMedia {
         if (!cellular && metered(context)) {
             return done(CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("reason", "cellular")))
         }
-        synchronized(inFlight) {
+        val flight = synchronized(inFlight) {
             inFlight[address]?.let { waiting ->
-                waiting.add(done)
+                waiting.waiting.add(done)
                 return
             }
-            inFlight[address] = mutableListOf(done)
+            Flight(java.util.UUID.randomUUID().toString(), mutableListOf(done)).also { inFlight[address] = it }
         }
         executor.execute {
             val result = runCatching {
@@ -1073,7 +1074,7 @@ internal object CraftNativeMedia {
                     val target = file(context, address)
                     target.parentFile?.mkdirs()
                     // Written aside and moved into place, so a half-written file is never played.
-                    val staging = File(target.parentFile, "${target.name}.part")
+                    val staging = File(target.parentFile, "${target.name}.${flight.id}.part")
                     try {
                         val size = connection.inputStream.use { input -> staging.outputStream().use { input.copyTo(it) } }
                         val expected = connection.contentLengthLong
@@ -1081,6 +1082,9 @@ internal object CraftNativeMedia {
                             return@runCatching CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file")
                         }
                         synchronized(inFlight) {
+                            if (inFlight[address]?.id != flight.id) {
+                                return@runCatching CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")
+                            }
                             if (!staging.renameTo(target)) {
                                 return@runCatching CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file")
                             }
@@ -1098,7 +1102,7 @@ internal object CraftNativeMedia {
                 }
                 CraftNativeCapabilityResult(code = if (full) "NO_SPACE" else if (error is java.net.SocketTimeoutException) "TIMEOUT" else "NETWORK_ERROR", message = error.message ?: "media.keep failed")
             }
-            val waiting = synchronized(inFlight) { inFlight.remove(address) ?: mutableListOf() }
+            val waiting = synchronized(inFlight) { if (inFlight[address]?.id == flight.id) inFlight.remove(address)?.waiting.orEmpty() else emptyList() }
             main.post { waiting.forEach { it(result) } }
         }
     }
@@ -1115,12 +1119,31 @@ internal object CraftNativeMedia {
         var removed = 0
         synchronized(inFlight) {
             // A concurrent keep owns its target and staging file until it finishes.
-            val active = inFlight.keys.map { file(context, it).name }.toSet()
+            val active = inFlight.flatMap { (address, flight) ->
+                val name = file(context, address).name
+                listOf(name, "$name.${flight.id}.part")
+            }.toSet()
+            root(context).listFiles()?.forEach { file ->
+                if (file.name !in active && file.name !in wanted && file.delete()) removed++
+            }
+        }
+        return removed
+    }
+
+    /** Invalidates old transfers before deleting files; a later keep starts afresh. */
+    fun clear(context: Context): Int {
+        var removed = 0
+        var failure: java.io.IOException? = null
+        val waiting = synchronized(inFlight) {
+            val callbacks = inFlight.values.flatMap { it.waiting }
+            inFlight.clear()
             root(context).listFiles()?.forEach { file ->
-                val target = file.name.removeSuffix(".part")
-                if (target !in active && file.name !in wanted && file.delete()) removed++
+                if (file.delete()) removed++ else failure = java.io.IOException("The video cache could not be cleared")
             }
+            callbacks
         }
+        main.post { waiting.forEach { it(CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")) } }
+        failure?.let { throw it }
         return removed
     }
 

package/templates/MainActivityNative.kt.template

@@ -4091,6 +4091,7 @@ class MainActivity : AppCompatActivity() {
                 show(target)
             } else {
                 host.removeView(target.view)
+                target.view.translationX = 0f
                 current.view.translationX = 0f
                 chrome?.selectTab(currentTab)
                 tabSwipeTarget = null
@@ -4504,6 +4505,11 @@ class MainActivity : AppCompatActivity() {
      * screen shown before hears true (its `navigation.onAppear`).
      */
     private fun show(screen: Screen) {
+        // A retained tab may have been the offscreen preview of a cancelled
+        // swipe, or the outgoing view of a completed swipe. Its animator can
+        // finish after the peer animator, so clear that ownership on display.
+        screen.view.animate().withEndAction(null).setListener(null).cancel()
+        screen.view.translationX = 0f
         // A navigation breadcrumb: the trail a crash report carries.
         if (visibleScreen !== screen) CraftCrashReporter.screenAppeared(screen.route ?: "home")
         val bars = chrome