extended nfc reaction to all possible nfc techs by subscribing ACTION_TAG_DISCOVERED

Author: juehv

app/src/main/AndroidManifest.xml

@@ -77,7 +77,9 @@
         </activity>
         <!-- NfcControlActivity processes NFC tags with AAPS commands.
              The device must be unlocked before the activity can run.
-             The intent filter limits it to tags with the specific MIME type. -->
+             NDEF_DISCOVERED fires for tags carrying the app MIME type.
+             TAG_DISCOVERED is a fallback for blank tags, finished Libre sensors,
+             and any other tag whose UID is registered in My Tags. -->
         <activity
             android:name="app.aaps.plugins.main.general.nfcCommands.NfcControlActivity"
             android:exported="true"
@@ -87,6 +89,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="application/vnd.app.aaps.command" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.nfc.action.TAG_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <!-- Receive new BG readings from other local apps -->

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/nfcCommands/NfcControlActivity.kt

@@ -60,7 +60,7 @@ open class NfcControlActivity : Activity() {
             return
         }
 
-        if (intent == null || NfcAdapter.ACTION_NDEF_DISCOVERED != intent.action) return
+        if (intent == null) return
 
         // Require a physical Tag object. Only the Android NFC subsystem can supply this;
         // an explicit intent crafted by another app cannot forge a real Tag instance,
@@ -73,6 +73,13 @@ open class NfcControlActivity : Activity() {
             return
         }
 
+        when (intent.action) {
+            NfcAdapter.ACTION_NDEF_DISCOVERED -> handleNdefIntent(intent, nfcTag)
+            NfcAdapter.ACTION_TAG_DISCOVERED  -> handleTagIntent(nfcTag)
+        }
+    }
+
+    private fun handleNdefIntent(intent: Intent, nfcTag: Tag) {
         // getParcelableArrayExtra(String) deprecated in API 33; type-safe overload requires API 33+, minSdk=26
         @Suppress("DEPRECATION")
         val rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES) ?: return
@@ -90,11 +97,23 @@ open class NfcControlActivity : Activity() {
         }
 
         val tagUid = NfcTokenSupport.tagUidHex(nfcTag.id) ?: return
-        aapsLogger.debug(LTag.NFC, "NFC tag scanned, UID: $tagUid")
+        executeByUid(tagUid, showErrorToast = true)
+    }
 
+    private fun handleTagIntent(nfcTag: Tag) {
+        val tagUid = NfcTokenSupport.tagUidHex(nfcTag.id) ?: return
+        aapsLogger.debug(LTag.NFC, "TAG_DISCOVERED fallback, UID: $tagUid")
+        // Silently ignore tags not registered in My Tags — TAG_DISCOVERED fires for all tags
+        // (credit cards, transit cards, etc.) and an error toast for every unknown card is
+        // intrusive. Only execute if the UID is explicitly registered.
+        executeByUid(tagUid, showErrorToast = false)
+    }
+
+    private fun executeByUid(tagUid: String, showErrorToast: Boolean) {
+        aapsLogger.debug(LTag.NFC, "NFC tag scanned, UID: $tagUid")
         when (val prep = nfcPlugin.prepareExecution(tagUid)) {
             is NfcPrepareResult.Error -> {
-                showToast(prep.message)
+                if (showErrorToast) showToast(prep.message)
                 return
             }
             is NfcPrepareResult.Ready -> {

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/nfcCommands/NfcCommandsPluginTest.kt

@@ -813,7 +813,7 @@ class NfcCommandsPluginTest : TestBaseWithProfile() {
         )
         whenever(rh.gs(eq(R.string.nfccommands_command_executed), any())).thenReturn("Command executed")
         whenever(dateUtil.now()).thenReturn(firstNow, callbackNow)
-        whenever(commandQueue.bolus(any(), any())).thenReturn(true)
+
         val callbackCaptor = argumentCaptor<Callback>()
 
         val result = plugin.executeCommand("BOLUS 1.0")
@@ -840,7 +840,7 @@ class NfcCommandsPluginTest : TestBaseWithProfile() {
         )
         whenever(rh.gs(eq(R.string.nfccommands_command_executed), any())).thenReturn("Command executed")
         whenever(dateUtil.now()).thenReturn(firstNow)
-        whenever(commandQueue.bolus(any(), any())).thenReturn(true)
+
         val callbackCaptor = argumentCaptor<Callback>()
 
         plugin.executeCommand("BOLUS 1.0")
@@ -865,7 +865,7 @@ class NfcCommandsPluginTest : TestBaseWithProfile() {
             app.aaps.core.objects.constraints.ConstraintObject(1.0, aapsLogger),
         )
         whenever(rh.gs(eq(R.string.nfccommands_command_executed), any())).thenReturn("Command executed")
-        whenever(commandQueue.bolus(any(), any())).thenReturn(true)
+
         whenever(preferences.get(StringNonKey.TempTargetPresets)).thenReturn(
             """[{"id":"test","reason":"Eating Soon","targetValue":99.0,"duration":2700000,"isDeletable":false}]"""
         )
@@ -899,7 +899,7 @@ class NfcCommandsPluginTest : TestBaseWithProfile() {
             app.aaps.core.objects.constraints.ConstraintObject(1.0, aapsLogger),
         )
         whenever(rh.gs(eq(R.string.nfccommands_command_executed), any())).thenReturn("Command executed")
-        whenever(commandQueue.bolus(any(), any())).thenReturn(true)
+
         runTest {
             whenever(profileFunction.getProfile()).thenReturn(null)
         }

plugins/main/src/test/kotlin/app/aaps/plugins/main/general/nfcCommands/NfcControlActivityTest.kt

@@ -142,6 +142,40 @@ class NfcControlActivityTest : TestBaseWithProfile() {
         verify(activity).appendReadLogEntry(org.mockito.kotlin.eq(uid), any())
     }
 
+    @Test
+    fun `handleIntent executes commands on TAG_DISCOVERED for registered UID`() {
+        val uid = NfcTokenSupport.tagUidHex(fakeUid)!!
+        whenever(nfcPlugin.prepareExecution(uid))
+            .thenReturn(NfcPrepareResult.Ready(uid, listOf("LOOP STOP")))
+        whenever(nfcPlugin.executeCascade(listOf("LOOP STOP")))
+            .thenReturn(NfcExecutionResult(true, "ok"))
+
+        activity.handleIntent(createTagDiscoveredIntent(mockNfcTag(fakeUid)))
+
+        verify(nfcPlugin).prepareExecution(uid)
+        verify(nfcPlugin).executeCascade(listOf("LOOP STOP"))
+    }
+
+    @Test
+    fun `handleIntent does nothing silently on TAG_DISCOVERED for unregistered UID`() {
+        val uid = NfcTokenSupport.tagUidHex(fakeUid)!!
+        whenever(nfcPlugin.prepareExecution(uid))
+            .thenReturn(NfcPrepareResult.Error("not registered"))
+
+        activity.handleIntent(createTagDiscoveredIntent(mockNfcTag(fakeUid)))
+
+        verify(nfcPlugin).prepareExecution(uid)
+        verify(nfcPlugin, never()).executeCascade(any())
+    }
+
+    @Test
+    fun `handleIntent does nothing on TAG_DISCOVERED without physical tag extra`() {
+        activity.handleIntent(createTagDiscoveredIntent(nfcTag = null))
+
+        verify(nfcPlugin, never()).prepareExecution(any())
+        verify(nfcPlugin, never()).executeCascade(any())
+    }
+
     // ── helpers ────────────────────────────────────────────────────────────
 
     private fun mockNfcTag(uid: ByteArray): Tag {
@@ -166,4 +200,12 @@ class NfcControlActivityTest : TestBaseWithProfile() {
         whenever(intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)).thenReturn(nfcTag)
         return intent
     }
+
+    private fun createTagDiscoveredIntent(nfcTag: Tag? = mockNfcTag(fakeUid)): Intent {
+        val intent = mock<Intent>()
+        whenever(intent.action).thenReturn(NfcAdapter.ACTION_TAG_DISCOVERED)
+        @Suppress("DEPRECATION")
+        whenever(intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)).thenReturn(nfcTag)
+        return intent
+    }
 }