TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-15 02:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): Drive monitor mode from first addressed profile

Browse Source
This commit is contained in:
darken
2026-06-22 20:16:37 +02:00
committed by Matthias Urhahn
parent fba2d3a59d
commit 358bf5e244
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/monitor/core/MonitorModeResolver.kt
+8 -2
View File
@@ -26,8 +26,14 @@ class MonitorModeResolver @Inject constructor(
profilesRepo.profiles,
nudgeCapabilityStore.availability,
) { profiles, nudge ->
val primary = profiles.firstOrNull() ?: return@combine MonitorMode.MANUAL
primary.requiredMode(nudge)
// The mode is driven by the first *addressed* profile, not just the first profile. An
// address-less profile can neither host an AAP session (AapAutoConnect requires an address)
// nor auto-connect, so it can only ever resolve to MANUAL. Letting such a profile sit at the
// top of the list and force MANUAL would silently stop the foreground service that keeps the
// process — and thus background AAP/stem controls — alive for an addressed profile below it.
// No addressed profile at all => genuinely nothing to monitor => MANUAL.
profiles.firstOrNull { !it.address.isNullOrBlank() }?.requiredMode(nudge)
?: MonitorMode.MANUAL
}
.distinctUntilChanged()
.onEach { log(TAG, VERBOSE) { "effectiveMode = $it" } }
app/src/test/java/eu/darken/capod/monitor/core/MonitorModeResolverTest.kt
+41 -7
View File
@@ -100,7 +100,7 @@ class MonitorModeResolverTest : BaseTest() {
}
@Test
fun `multi-profile primary-only - primary case 2 + secondary case 3 - AUTOMATIC`() = runTest {
fun `first addressed profile controls mode - addressed primary case 2 + addressed secondary case 3 - AUTOMATIC`() = runTest {
profilesFlow.value = listOf(
profile(id = "primary", autoConnect = false),
profile(id = "secondary", autoConnect = true),
@@ -111,25 +111,59 @@ class MonitorModeResolverTest : BaseTest() {
}
@Test
fun `multi-profile primary-only - primary case 4 + secondary case 2 - MANUAL`() = runTest {
fun `unpaired primary is skipped when an addressed secondary exists - AUTOMATIC`() = runTest {
profilesFlow.value = listOf(
profile(id = "primary", address = null),
profile(id = "secondary", address = "AA:BB:CC:DD:EE:FF"),
)
resolver.effectiveMode.first() shouldBe MonitorMode.AUTOMATIC
}
@Test
fun `unpaired primary is skipped - addressed autoConnect secondary drives ALWAYS`() = runTest {
profilesFlow.value = listOf(
profile(id = "primary", address = null),
profile(id = "secondary", address = "AA:BB:CC:DD:EE:FF", autoConnect = true),
)
nudgeFlow.value = NudgeAvailability.AVAILABLE
resolver.effectiveMode.first() shouldBe MonitorMode.ALWAYS
}
@Test
fun `blank-address primary is skipped when an addressed secondary exists`() = runTest {
profilesFlow.value = listOf(
profile(id = "primary", address = " "),
profile(id = "secondary", address = "AA:BB:CC:DD:EE:FF", autoConnect = true),
)
nudgeFlow.value = NudgeAvailability.AVAILABLE
resolver.effectiveMode.first() shouldBe MonitorMode.ALWAYS
}
@Test
fun `all profiles unpaired - MANUAL`() = runTest {
profilesFlow.value = listOf(
profile(id = "a", address = null, autoConnect = true),
profile(id = "b", address = "", autoConnect = true),
)
nudgeFlow.value = NudgeAvailability.AVAILABLE
resolver.effectiveMode.first() shouldBe MonitorMode.MANUAL
}
@Test
fun `list reorder makes the secondary primary - mode flips`() = runTest {
val a = profile(id = "a", autoConnect = true)
val b = profile(id = "b", autoConnect = false)
fun `reorder among addressed profiles still flips the mode, unpaired stays ignored`() = runTest {
val unpaired = profile(id = "unpaired", address = null)
val addressedAuto = profile(id = "addressedAuto", autoConnect = true)
val addressedManual = profile(id = "addressedManual", autoConnect = false)
nudgeFlow.value = NudgeAvailability.AVAILABLE
profilesFlow.value = listOf(a, b)
profilesFlow.value = listOf(unpaired, addressedAuto, addressedManual)
resolver.effectiveMode.first() shouldBe MonitorMode.ALWAYS
profilesFlow.value = listOf(b, a)
profilesFlow.value = listOf(unpaired, addressedManual, addressedAuto)
resolver.effectiveMode.first() shouldBe MonitorMode.AUTOMATIC
}