Handle the new Android tag expiration time

HiddenRamblings · Sep 7, 2024 · 922ced0 · 922ced0
1 parent 8da282d
commit 922ced0
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/app/src/main/java/com/hiddenramblings/tagmo/nfctech/NfcActivity.kt b/app/src/main/java/com/hiddenramblings/tagmo/nfctech/NfcActivity.kt
@@ -9,6 +9,7 @@ import android.content.IntentFilter
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.TagLostException
+import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.view.Menu
@@ -516,6 +517,9 @@ class NfcActivity : AppCompatActivity() {
             Debug.warn(e)
             Debug.getExceptionCause(e)?.let { error ->
                 when {
+                    e is SecurityException -> {
+
+                    }
                     getString(R.string.error_tag_rewrite) == error -> {
                         withContext(Dispatchers.Main) {
                             getErrorDialog(
@@ -807,13 +811,22 @@ class NfcActivity : AppCompatActivity() {
             NFCIntent.ACTION_UNLOCK_UNIT,
             -> startNfcMonitor()
         }
+
+        if (Version.isTiramisu && (NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action
+                    || NfcAdapter.ACTION_TECH_DISCOVERED == intent.action
+                    || NfcAdapter.ACTION_TAG_DISCOVERED == intent.action)) {
+            val tech = tagTech ?: getString(R.string.nfc_tag)
+            showMessage(R.string.tag_detected, tech)
+            CoroutineScope(Dispatchers.IO).launch { onTagDiscovered(intent) }
+        }
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        if (NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action
-            || NfcAdapter.ACTION_TECH_DISCOVERED == intent.action
-            || NfcAdapter.ACTION_TAG_DISCOVERED == intent.action) {
+        if (Version.isLowerThan(Build.VERSION_CODES.TIRAMISU)
+            && (NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action
+                    || NfcAdapter.ACTION_TECH_DISCOVERED == intent.action
+                    || NfcAdapter.ACTION_TAG_DISCOVERED == intent.action)) {
             val tech = tagTech ?: getString(R.string.nfc_tag)
             showMessage(R.string.tag_detected, tech)
             CoroutineScope(Dispatchers.IO).launch { onTagDiscovered(intent) }