diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt index 1713b4ba75..0d1cba2d3c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -61,20 +61,20 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco } } - private var zipFile: File? = null - private val onNFCReaderCallback: NfcAdapter.ReaderCallback? = null - private var antenna: DeviceNFCAntennaLocation? = null private var nfcManager: NfcManager? = null - private var readCardInfoTask: ReadCardInfoTask? = null + private var zipFile: File? = null + private var antenna: DeviceNFCAntennaLocation? = null private var unsuccessReadCount = 0 private var lastTag: Tag? = null + private var readCardInfoTask: ReadCardInfoTask? = null + private var onNfcReaderCallback: NfcAdapter.ReaderCallback? = null override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) - if (tag != null && onNFCReaderCallback != null) - onNFCReaderCallback.onTagDiscovered(tag) + if (tag != null && onNfcReaderCallback != null) + onNfcReaderCallback!!.onTagDiscovered(tag) } } @@ -90,6 +90,8 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco commonInit(applicationContext) + setNfcAdapterReaderCallback(this) + rippleBackgroundNfc.startRippleAnimation() antenna = DeviceNFCAntennaLocation() @@ -126,8 +128,8 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco val intent = intent if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) - if (tag != null && onNFCReaderCallback != null) { - onNFCReaderCallback.onTagDiscovered(tag) + if (tag != null && onNfcReaderCallback != null) { + onNfcReaderCallback!!.onTagDiscovered(tag) } } @@ -137,7 +139,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco RootFoundDialog().show(fragmentManager, RootFoundDialog.TAG) // set listeners - fab.setOnClickListener { this.showMenu(it) } + fab.setOnClickListener { showMenu(it) } if (BuildConfig.DEBUG) { fab.setOnLongClickListener { @@ -365,6 +367,10 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco WaitSecurityDelayDialog.onReadAfterRequest(Objects.requireNonNull(this)) } + private fun setNfcAdapterReaderCallback(callback: NfcAdapter.ReaderCallback) { + onNfcReaderCallback = callback + } + private fun showLogoActivity() { val intent = Intent(baseContext, LogoActivity::class.java) intent.putExtra(LogoActivity.TAG, true)