Retain BLE cleanup ownership until each Android release succeeds

This commit is contained in:
evgeny committed 2026-10-29 13:53:22 +01:00
1 parent 2f0d9e4bf0
commit d0b79e83ef
2 files changed
+61

No files matched your search

@@ -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<Any, Resource>()
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()
}
}
@@ -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<String>()
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)
}
}