diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b24b163742..21ee9f11d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
android:required="true" />
-
+
diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
index 86667d4046..f7d1e3a430 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
@@ -33,11 +33,12 @@ import kotlinx.android.synthetic.main.fr_verify_card.*
import java.io.IOException
import java.util.*
-class VerifyCard : Fragment() {
+class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
companion object {
val TAG: String = VerifyCard::class.java.simpleName
}
+ private lateinit var nfcManager: NfcManager
private lateinit var ctx: TangemContext
private var requestPIN2Count = 0
@@ -47,6 +48,7 @@ class VerifyCard : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ nfcManager = NfcManager(activity, this)
ctx = TangemContext.loadFromBundle(activity, activity?.intent?.extras)
}
@@ -188,6 +190,29 @@ class VerifyCard : Fragment() {
}
}
+ override fun onResume() {
+ super.onResume()
+ nfcManager.onResume()
+ }
+
+ override fun onPause() {
+ super.onPause()
+ nfcManager.onPause()
+ }
+
+ override fun onStop() {
+ super.onStop()
+ nfcManager.onStop()
+ }
+
+ override fun onTagDiscovered(tag: Tag?) {
+ try {
+ nfcManager.ignoreTag(tag)
+ } catch (e: IOException) {
+ e.printStackTrace()
+ }
+ }
+
private fun updateViews() {
try {
if (timerHideErrorAndMessage != null) {
diff --git a/build.gradle b/build.gradle
index 03239d7756..3648e89e4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.3.11'
+ ext.kotlin_version = '1.3.20'
repositories {
google()
jcenter()