From d0b79e83ef6891b556c456a2aa8a8d583fb4ea3e Mon Sep 17 00:00:00 2001 From: evgeny Date: Thu, 29 Oct 2026 13:53:22 +0100 Subject: [PATCH] Retain BLE cleanup ownership until each Android release succeeds --- .../com/utun/chat/data/BleRadioCleanup.kt | 24 ++++++++++++ .../com/utun/chat/data/BleRadioCleanupTest.kt | 37 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 tools/chatgui-android/app/src/main/java/com/utun/chat/data/BleRadioCleanup.kt create mode 100644 tools/chatgui-android/app/src/test/java/com/utun/chat/data/BleRadioCleanupTest.kt diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/BleRadioCleanup.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/BleRadioCleanup.kt new file mode 100644 index 000000000..58a0db4a7 --- /dev/null +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/BleRadioCleanup.kt @@ -0,0 +1,24 @@ +package com.utun.chat.data + +/** Один BLE HandlerThread: сильное владение SDK-ресурсами до успешного close/stop. + * Отказ одного release не мешает остальным; новый radio запуск разрешён лишь после retry=true. */ +internal class BleRadioCleanup(private val log: (String, String) -> Unit) { + private data class Resource(val name: String, val close: () -> Unit) + private val pending = java.util.IdentityHashMap() + val isEmpty: Boolean get() = pending.isEmpty() + + fun retain(key: Any, name: String, close: () -> Unit) { + if (!pending.containsKey(key)) pending[key] = Resource(name, close) + } + + fun retry(): Boolean { + for ((key, resource) in pending.entries.map { it.key to it.value }) { + try { + resource.close() + pending.remove(key) + log("INFO", "Released ${resource.name}") + } catch (e: RuntimeException) { log("ERROR", "Release failed ${resource.name}; retained for retry: $e") } + } + return pending.isEmpty() + } +} diff --git a/tools/chatgui-android/app/src/test/java/com/utun/chat/data/BleRadioCleanupTest.kt b/tools/chatgui-android/app/src/test/java/com/utun/chat/data/BleRadioCleanupTest.kt new file mode 100644 index 000000000..b1e96ca47 --- /dev/null +++ b/tools/chatgui-android/app/src/test/java/com/utun/chat/data/BleRadioCleanupTest.kt @@ -0,0 +1,37 @@ +package com.utun.chat.data + +import org.junit.Assert.* +import org.junit.Test + +class BleRadioCleanupTest { + @Test fun failingReleaseRemainsOwnedWhileOtherResourcesClose() { + val messages = mutableListOf() + val cleanup = BleRadioCleanup { level, message -> messages.add("$level $message") } + var unavailable = true + var failedCalls = 0 + var otherCalls = 0 + val first = Any() + cleanup.retain(first, "scan") { failedCalls++; if (unavailable) throw SecurityException("permission revoked") } + cleanup.retain(Any(), "gatt") { otherCalls++ } + assertFalse(cleanup.retry()) + assertEquals(1, failedCalls); assertEquals(1, otherCalls) + assertFalse(cleanup.isEmpty) + assertTrue(messages.any { it.contains("ERROR") && it.contains("scan") && it.contains("permission revoked") }) + cleanup.retain(first, "replacement") { fail("Original owner replaced") } + unavailable = false + assertTrue(cleanup.retry()) + assertEquals(2, failedCalls); assertEquals(1, otherCalls) + assertTrue(cleanup.isEmpty) + assertTrue(cleanup.retry()); assertEquals(2, failedCalls) + } + @Test fun equalSdkObjectsKeepIndependentOwnership() { + val cleanup = BleRadioCleanup { _, _ -> } + val first = String(charArrayOf('x')); val second = String(charArrayOf('x')) + assertNotSame(first, second) + var released = 0 + cleanup.retain(first, "first") { released++ } + cleanup.retain(second, "second") { released++ } + assertTrue(cleanup.retry()) + assertEquals(2, released) + } +}