nacabaro/vbhelper
1
0
Fork 0
mirror of https://github.com/nacabaro/vbhelper.git synced 2026-07-30 00:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicate HCE scans and suppress NFC redispatch

Browse Source
This commit is contained in:
Taveon Nelson 2026-04-21 15:00:14 -05:00
parent cd9a6d5d80
commit d40428ccfd
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreenControllerImpl.kt
View File

@ -61,6 +61,7 @@ class ScanScreenControllerImpl(
companion object { companion object {
private const val TAG_DEBOUNCE_MS = 1500L private const val TAG_DEBOUNCE_MS = 1500L
private const val TAG_IGNORE_AFTER_HANDLED_MS = 2000
private val VITALWEAR_AID = byteArrayOf( private val VITALWEAR_AID = byteArrayOf(
0xF0.toByte(), 0x56, 0x49, 0x54, 0x41, 0x4C, 0x57, 0x45, 0x41, 0x52 0xF0.toByte(), 0x56, 0x49, 0x54, 0x41, 0x4C, 0x57, 0x45, 0x41, 0x52
) )
@ -266,6 +267,7 @@ class ScanScreenControllerImpl(
options.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 250) options.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 250)
val flags = NfcAdapter.FLAG_READER_NFC_A or val flags = NfcAdapter.FLAG_READER_NFC_A or
NfcAdapter.FLAG_READER_NFC_B or NfcAdapter.FLAG_READER_NFC_B or
NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS or
NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
val sessionId = readerSessionCounter.incrementAndGet() val sessionId = readerSessionCounter.incrementAndGet()
activeReaderSessionId = sessionId activeReaderSessionId = sessionId
@ -312,8 +314,8 @@ class ScanScreenControllerImpl(
try { try {
// Prefer ISO-DEP whenever present so HCE sessions do not accidentally fall through to NFC-A. // Prefer ISO-DEP whenever present so HCE sessions do not accidentally fall through to NFC-A.
if (hasIsoDepRoute) { if (hasIsoDepRoute) {
val isoDepTarget = isoDep!! val isoDepTarget = isoDep
val isoDepAction = isoDepHandler!! val isoDepAction = isoDepHandler
val confirmedVitalWear = runCatching { isVitalWearHceTarget(isoDepTarget) }.getOrDefault(false) val confirmedVitalWear = runCatching { isVitalWearHceTarget(isoDepTarget) }.getOrDefault(false)
if (!confirmedVitalWear) { if (!confirmedVitalWear) {
Log.w("NFC_HCE", "IsoDep tag did not confirm VitalWear AID; attempting ISO-DEP handler without NFC-A fallback") Log.w("NFC_HCE", "IsoDep tag did not confirm VitalWear AID; attempting ISO-DEP handler without NFC-A fallback")
@ -346,16 +348,32 @@ class ScanScreenControllerImpl(
} }
} }
} finally { } finally {
if (activeReaderSessionId == sessionId) { finishHandledTagSession(tag, sessionId)
disableReaderModeSafely()
isHandlingTag.set(false)
}
} }
} }
} }
} }
} }
private fun finishHandledTagSession(tag: Tag, sessionId: Long) {
if (activeReaderSessionId != sessionId) return
// Keep Android from redispatching this same tag to other NFC apps while still in range.
runCatching {
nfcAdapter.ignore(
tag,
TAG_IGNORE_AFTER_HANDLED_MS,
NfcAdapter.OnTagRemovedListener { },
null
)
}.onFailure {
Log.w("NFC", "Failed to ignore handled tag", it)
}
disableReaderModeSafely()
isHandlingTag.set(false)
}
private fun handleNfcATag( private fun handleNfcATag(
tag: Tag, tag: Tag,
secrets: Secrets, secrets: Secrets,