GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2018-08-13 10:26:46 +03:00
parent 9afd07d0d9
commit aff84ada71
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
View file

@ -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<Tag>(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<Tag>(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)