From 452c5511bcda9aa4f36fdfd1b15beef6c0de08df Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 18:31:15 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/App.java | 13 +++++++++++ .../com/tangem/data/nfc/ReadCardInfoTask.java | 4 ++-- .../activity/ConfirmPaymentActivity.kt | 2 +- .../activity/CreateNewWalletActivity.kt | 2 +- .../activity/EmptyWalletActivity.kt | 2 +- .../activity/LoadedWalletActivity.kt | 2 +- .../presentation/activity/MainActivity.kt | 22 +++++++++---------- .../activity/PinRequestActivity.kt | 2 +- .../presentation/activity/PinSaveActivity.kt | 2 +- .../presentation/activity/PinSwapActivity.kt | 2 +- ...pareCryptonitOtherApiWithdrawalActivity.kt | 10 ++++----- .../PrepareCryptonitWithdrawalActivity.kt | 2 +- .../PrepareKrakenWithdrawalActivity.kt | 2 +- .../activity/PreparePaymentActivity.kt | 2 +- .../presentation/activity/PurgeActivity.kt | 2 +- .../activity/SendTransactionActivity.kt | 2 +- .../activity/SignPaymentActivity.kt | 2 +- .../activity/VerifyCardActivity.kt | 2 +- .../dialog/WaitSecurityDelayDialog.java | 1 + .../drawable/ic_content_copy_black_24dp.xml | 0 .../main/res/drawable/ic_nfc_white_24dp.xml | 0 .../res/drawable/ic_wrench_white_24dp.xml | 0 gradlew | 0 23 files changed, 46 insertions(+), 32 deletions(-) mode change 100755 => 100644 app/src/main/res/drawable/ic_content_copy_black_24dp.xml mode change 100755 => 100644 app/src/main/res/drawable/ic_nfc_white_24dp.xml mode change 100755 => 100644 app/src/main/res/drawable/ic_wrench_white_24dp.xml mode change 100755 => 100644 gradlew diff --git a/app/src/main/java/com/tangem/App.java b/app/src/main/java/com/tangem/App.java index b63bdafa7e..8f8a25d409 100644 --- a/app/src/main/java/com/tangem/App.java +++ b/app/src/main/java/com/tangem/App.java @@ -3,10 +3,13 @@ package com.tangem; import android.app.Application; import android.support.v7.app.AppCompatDelegate; +import com.tangem.data.db.PINStorage; import com.tangem.di.DaggerNavigatorComponent; import com.tangem.di.DaggerNetworkComponent; import com.tangem.di.NavigatorComponent; import com.tangem.di.NetworkComponent; +import com.tangem.domain.cardReader.Firmwares; +import com.tangem.domain.wallet.Issuer; public class App extends Application { @@ -38,6 +41,16 @@ public class App extends Application { networkComponent = DaggerNetworkComponent.create(); navigatorComponent = buildNavigatorComponent(); + + // common init + if (PINStorage.needInit()) + PINStorage.init(getApplicationContext()); + + if (Issuer.needInit()) + Issuer.init(getApplicationContext()); + + if (Firmwares.needInit()) + Firmwares.init(getApplicationContext()); } /** diff --git a/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java b/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java index f0fa541df9..f7300a2d35 100644 --- a/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java +++ b/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java @@ -27,8 +27,8 @@ public class ReadCardInfoTask extends Thread { private static String lastRead_UID; public static void resetLastReadInfo() { - lastRead_UID=""; - lastRead_Encryption=null; + lastRead_UID = ""; + lastRead_Encryption = null; lastRead_UnsuccessfullPINs.clear(); } diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt index 9b3741d068..e0c1b86d45 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt @@ -61,7 +61,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_confirm_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt index f1334508bd..0e7cdd8655 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -43,7 +43,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, super.onCreate(savedInstanceState) setContentView(R.layout.activity_create_new_wallet) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt index e31879e9cc..c899e343da 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -46,7 +46,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card super.onCreate(savedInstanceState) setContentView(R.layout.activity_empty_wallet) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt index 1356658cb8..016901085d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt @@ -33,7 +33,7 @@ class LoadedWalletActivity : AppCompatActivity() { App.getNavigatorComponent().inject(this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) if (intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) 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 91186d4325..c923abe3c4 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -55,16 +55,16 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco fun callingIntent(context: Context) = Intent(context, MainActivity::class.java) - fun commonInit(context: Context) { - if (PINStorage.needInit()) - PINStorage.init(context) - - if (Issuer.needInit()) - Issuer.init(context) - - if (Firmwares.needInit()) - Firmwares.init(context) - } +// fun commonInit(context: Context) { +// if (PINStorage.needInit()) +// PINStorage.init(context) +// +// if (Issuer.needInit()) +// Issuer.init(context) +// +// if (Firmwares.needInit()) +// Firmwares.init(context) +// } } private var nfcManager: NfcManager? = null @@ -101,7 +101,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR - commonInit(applicationContext) +// commonInit(applicationContext) setNfcAdapterReaderCallback(this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt index 820dfb4dae..c91c59a6fc 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -53,7 +53,7 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_request) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt index de85d4c251..c5a0d1f57a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -56,7 +56,7 @@ class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelper super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_save) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) usePIN2 = intent.getBooleanExtra("PIN2", false) diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt index 9b7c749348..4bdac7b598 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -44,7 +44,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_swap) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index d7f21d2cac..ad2c17d0e5 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -38,7 +38,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_cryptonit_other_api_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) @@ -57,7 +57,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt tvCurrency.text = engine!!.balanceCurrency etAmount.setText(engine.convertToAmount(engine.convertToInternalAmount(ctx.card!!.denomination)).toValueString()) - etAmount.filters=engine.amountInputFilters + etAmount.filters = engine.amountInputFilters // set listeners btnLoad.setOnClickListener { @@ -66,7 +66,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt val strAmount: String = etAmount.text.toString().replace(",", ".") // if (!engine.checkAmount(card, strAmount)) // etAmount.error = getString(R.string.unknown_amount_format) - var dblAmount: Double = strAmount.toDouble() + val dblAmount: Double = strAmount.toDouble() rlProgressBar.visibility = View.VISIBLE tvProgressDescription.text = getString(R.string.cryptonit_request_withdrawal) @@ -177,8 +177,8 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if( resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode") ) { - when(requestCode) { + if (resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode")) { + when (requestCode) { REQUEST_CODE_SCAN_QR_KEY -> { cryptonit!!.key = data.getStringExtra("QRCode") tvKey!!.text = cryptonit!!.key diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt index 167739a07a..edc71f556c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -39,7 +39,7 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_cryptonit_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt index 1bafe7e5a3..bfbf3652f6 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt @@ -45,7 +45,7 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_kraken_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt index 987f307e47..456d8d8b0a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt @@ -37,7 +37,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt index bc74b7da35..ddb499459b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -42,7 +42,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc nfcManager = NfcManager(this, this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) ctx = TangemContext.loadFromBundle(this, intent.extras) diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt index 279c561445..9dfd11aa45 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -36,7 +36,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_send_transaction) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt index 52c13893f4..324c129de2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt @@ -56,7 +56,7 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card super.onCreate(savedInstanceState) setContentView(R.layout.activity_sign_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt index 6841d4bc83..54203243e7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -34,7 +34,7 @@ class VerifyCardActivity : AppCompatActivity() { App.getNavigatorComponent().inject(this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) } override fun onBackPressed() { diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java index 00a53361a6..8e61a1087b 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java @@ -143,6 +143,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { if (msec == 0) { if (instance != null) { + // TODO java.lang.NullPointerException: Attempt to invoke virtual method 'android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentManager.beginTransaction()' on a null object reference instance.dismiss(); instance = null; } diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/drawable/ic_nfc_white_24dp.xml b/app/src/main/res/drawable/ic_nfc_white_24dp.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/drawable/ic_wrench_white_24dp.xml b/app/src/main/res/drawable/ic_wrench_white_24dp.xml old mode 100755 new mode 100644 diff --git a/gradlew b/gradlew old mode 100755 new mode 100644