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-09-12 12:06:42 +03:00
parent f0c7cf4bbe
commit ec88c1e832
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
nfcManager = NfcManager(this, this)
verifyPermissions()
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
@ -149,12 +150,12 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
// set listeners
fab.setOnClickListener { showMenu(it) }
if (BuildConfig.DEBUG) {
fab.setOnLongClickListener {
startActivity(Intent(this, SettingsDebugActivity::class.java))
false
}
}
// if (BuildConfig.DEBUG) {
// fab.setOnLongClickListener {
// startActivity(Intent(this, SettingsDebugActivity::class.java))
// false
// }
// }
val apiHelper = ServerApiHelper()
apiHelper.setLastVersionListener { response ->
@ -163,7 +164,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
apiHelper.requestLastVersion()
}
fun verifyPermissions() {
private fun verifyPermissions() {
NfcManager.verifyPermissions(this)
if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
Log.e("QRScanActivity", "User hasn't granted permission to use camera")

9
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
View file

@ -669,10 +669,10 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
tvBlockchain.text = card!!.blockchainName
btnExtract.isEnabled = card!!.hasBalanceInfo()
if (btnExtract.isEnabled)
if (card!!.hasBalanceInfo()) {
btnExtract.isEnabled = true
btnExtract.backgroundTintList = activeColor
}
card!!.error = null
card!!.message = null
@ -796,6 +796,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
if (needResendTX)
sendTransaction(LastSignStorage.getTxForSend(card!!.wallet))
// if (btnExtract.isEnabled)
}
fun prepareResultIntent(): Intent {