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

fix: Prevent duplicate device cards for stranger AirPods with same model

Browse Source
This commit is contained in:
darken
2026-04-13 14:09:33 +02:00
committed by Matthias Urhahn
parent 7f2b6976ce
commit 70d9c047dc
3 changed files with 132 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/monitor/core/DeviceMonitor.kt
+29 -3
View File
@@ -12,6 +12,7 @@ import eu.darken.capod.monitor.core.cache.DeviceStateCache
import eu.darken.capod.monitor.core.cache.toCachedState
import eu.darken.capod.pods.core.apple.PodModel
import eu.darken.capod.pods.core.apple.aap.AapConnectionManager
import eu.darken.capod.pods.core.apple.ble.devices.ApplePods
import eu.darken.capod.pods.core.apple.aap.AapPodState
import eu.darken.capod.profiles.core.AppleDeviceProfile
import eu.darken.capod.profiles.core.DeviceProfile
@@ -66,13 +67,38 @@ class DeviceMonitor @Inject constructor(
)
}
// Collapse live duplicates sharing an identity-backed profile — e.g. when the legacy
// signal-quality fallback misattributed ambient strangers to our profile.
// Only applied when the group has at least one IRK-verified candidate; for no-IRK
// profiles, multiple hits are genuinely different devices and must all remain visible.
val profileDedupedLive = run {
val anonymous = liveDevices.filter { it.profileId == null }
val byProfile = liveDevices
.filter { it.profileId != null }
.groupBy { it.profileId!! }
.flatMap { (_, group) ->
val hasIrkMatch = group.any { (it.ble as? ApplePods)?.meta?.isIRKMatch == true }
if (!hasIrkMatch || group.size == 1) {
group
} else {
listOf(
group.sortedWith(
compareByDescending<PodDevice> { (it.ble as? ApplePods)?.meta?.isIRKMatch == true }
.thenByDescending { it.signalQuality }
).first()
)
}
}
byProfile + anonymous
}
// Non-live devices — profiles with no live BLE detection. Synthesize from cache
// and/or AAP, whichever is available:
// - cache only → "cached-only" case (PR #484 fixed AAP attach here)
// - AAP only → cold-start case: AAP connected but no battery message
// received yet, so no cache write has happened
// - cache + AAP → mid-session BLE staleness with AAP still alive
val liveProfileIds = liveDevices.mapNotNull { it.profileId }.toSet()
val liveProfileIds = profileDedupedLive.mapNotNull { it.profileId }.toSet()
val nonLiveDevices = profiles
.filter { it.id !in liveProfileIds }
.mapNotNull { profile ->
@@ -103,10 +129,10 @@ class DeviceMonitor @Inject constructor(
.filter { it != PodModel.UNKNOWN }
.toSet()
val dedupedLiveDevices = if (nonLiveAapModels.isEmpty()) {
liveDevices
profileDedupedLive
} else {
val seenAnonymousModels = mutableSetOf<PodModel>()
liveDevices.filter { device ->
profileDedupedLive.filter { device ->
val isAnonymous = device.profileId == null
val matchesNonLive = device.model in nonLiveAapModels
// Hide at most one anonymous BLE pod per non-live AAP model so a second
app/src/main/java/eu/darken/capod/pods/core/apple/ble/AppleFactory.kt
+10
View File
@@ -100,8 +100,18 @@ class AppleFactory @Inject constructor(
meta = ApplePods.AppleMeta(),
)
profile = profiles
.filter { it.identityKey == null }
.filter { it.model == PodModel.UNKNOWN || it.model == tempDevice.model }
.firstOrNull { it.minimumSignalQuality <= tempDevice.signalQuality }
if (profile == null) {
val legacyCandidate = profiles
.filter { it.identityKey != null && (it.model == PodModel.UNKNOWN || it.model == tempDevice.model) }
.firstOrNull { it.minimumSignalQuality <= tempDevice.signalQuality }
if (legacyCandidate != null) {
log(TAG, WARN) { "Keyed profile ${legacyCandidate.id} would match via old fallback (IRK failed) — stale key?" }
}
}
}
factory.create(