From ec88c1e83292e6f77afc81dd3be0742c21804327 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 12 Sep 2018 12:06:42 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/presentation/activity/MainActivity.kt | 15 ++++++++------- .../tangem/presentation/fragment/LoadedWallet.kt | 9 ++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) 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 b3930b71f4..8fbe32d295 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -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") 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 638c5d17ae..02f0d7f27f 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -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 {