From 53e0148dd50fd7ac0d0149c29e3e51d50e9a6a53 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 11 Feb 2019 12:01:47 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/presentation/fragment/LoadedWallet.kt  | 11 ++++++++---
 .../tangem/tangemcard/android/reader/NfcManager.kt    | 10 ++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index e92607f783..3a0117b6fc 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -11,7 +11,6 @@ import android.nfc.Tag
 import android.nfc.tech.IsoDep
 import android.os.Build
 import android.os.Bundle
-import androidx.core.content.ContextCompat
 import android.text.Html
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -19,6 +18,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import com.tangem.App
 import com.tangem.Constant
 import com.tangem.data.Blockchain
@@ -27,7 +27,10 @@ import com.tangem.domain.wallet.BalanceValidator
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
-import com.tangem.presentation.activity.*
+import com.tangem.presentation.activity.LoadedWalletActivity
+import com.tangem.presentation.activity.PinRequestActivity
+import com.tangem.presentation.activity.PrepareCryptonitWithdrawalActivity
+import com.tangem.presentation.activity.PrepareKrakenWithdrawalActivity
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.PINSwapWarningDialog
 import com.tangem.presentation.dialog.ShowQRCodeDialog
@@ -467,6 +470,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
         verifyCardTask = null
         if (cardProtocol != null) {
             if (cardProtocol.error == null) {
+
                 rlProgressBar?.post {
                     rlProgressBar?.visibility = View.GONE
                     this.cardProtocol = cardProtocol
@@ -747,7 +751,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                     ?: throw CardProtocol.TangemException(getString(R.string.wrong_tag_err))
             val uid = tag!!.id
             val sUID = Util.byteArrayToHexString(uid)
-            if (ctx.card.uid != sUID) {
+            if (ctx.card.uid != sUID || cardProtocol != null) {
                 nfcManager.ignoreTag(isoDep.tag)
                 return
             }
@@ -757,6 +761,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
             else
                 isoDep.timeout = 65000
 
+
             verifyCardTask = VerifyCardTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, App.firmwaresStorage, this)
             verifyCardTask?.start()
         } catch (e: Exception) {
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
index 5216e86052..189eeadef2 100644
--- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
@@ -88,12 +88,14 @@ class NfcManager(private val activity: FragmentActivity, private val readerCallb
 
     @Throws(IOException::class)
     fun ignoreTag(tag: Tag) {
-        //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        //            nfcAdapter.ignore(tag, 500, null, null);
-        //        }else{
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            nfcAdapter?.ignore(tag, 500, null, null);
+        } else {
+
+        }
+
         val isoDep = IsoDep.get(tag)
         isoDep?.close()
-        //        }
     }
 
     fun notifyReadResult(success: Boolean) {