From ce7b5e9f84b88264f92fc2b86234e1ae29febe90 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 1 Apr 2019 13:15:54 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/di/Navigator.kt | 4 +++ .../com/tangem/ui/activity/LogoActivity.kt | 10 ++++++- .../tangem/ui/PrepareTransactionActivity.kt | 10 +++---- .../tangem/domain/wallet/TangemContext.java | 28 ++++++++++--------- .../tangem/ui/PrepareTransactionActivity.kt | 6 ++++ 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index d9c9c4ed6b..7267c62696 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -73,6 +73,10 @@ class Navigator { context.startActivityForResult(PrepareTransactionActivity.callingIntent(context, ctx), Constant.REQUEST_CODE_SEND_TRANSACTION) } + fun showPrepareTransaction(context: Activity) { + context.startActivity(PrepareTransactionActivity.callingIntent(context)) + } + fun showCreateNewWallet(context: Activity, ctx: TangemContext) { context.startActivityForResult(CreateNewWalletActivity.callingIntent(context, ctx), Constant.REQUEST_CODE_CREATE_NEW_WALLET_ACTIVITY) } diff --git a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt index 01fc01a4b4..866b43765e 100644 --- a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt @@ -61,7 +61,15 @@ class LogoActivity : AppCompatActivity() { } private fun hide() { - navigator.showMain(this) + when (BuildConfig.FLAVOR) { + Constant.FLAVOR_TANGEM_CARDANO -> { + navigator.showPrepareTransaction(this) + } + else -> { + navigator.showMain(this) + } + } + finish() } diff --git a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt index c6edc34fb4..8b74db564d 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt @@ -69,14 +69,14 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac rgIncFee.visibility = View.VISIBLE } - if (ctx.card!!.remainingSignatures < 2) - etAmount.isEnabled = false +// if (ctx.card!!.remainingSignatures < 2) +// etAmount.isEnabled = false - tvCurrency.text = engine.balance.currency - etAmount.setText(engine.balance.toValueString()) +// tvCurrency.text = engine.balance.currency +// etAmount.setText(engine.balance.toValueString()) // limit number of symbols after comma - etAmount.filters = engine.amountInputFilters +// etAmount.filters = engine.amountInputFilters // set listeners etAmount.setOnEditorActionListener { lv, actionId, _ -> diff --git a/app/src/tangemCardano/java/com/tangem/domain/wallet/TangemContext.java b/app/src/tangemCardano/java/com/tangem/domain/wallet/TangemContext.java index 090359c3cc..aa3262aff8 100644 --- a/app/src/tangemCardano/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/tangemCardano/java/com/tangem/domain/wallet/TangemContext.java @@ -117,20 +117,22 @@ public class TangemContext { TangemContext tangemContext = new TangemContext(); tangemContext.setContext(context); - if (bundle.containsKey(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)) { - tangemContext.card = new TangemCard(bundle.getString(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)); - TangemCardExtensionsKt.loadFromBundle(tangemContext.card, bundle.getBundle(TangemCardExtensionsKt.EXTRA_TANGEM_CARD)); - } +// if (bundle.containsKey(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)) { +// tangemContext.card = new TangemCard(bundle.getString(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)); +// TangemCardExtensionsKt.loadFromBundle(tangemContext.card, bundle.getBundle(TangemCardExtensionsKt.EXTRA_TANGEM_CARD)); +// } - if (tangemContext.getBlockchain() != null) { - if (bundle.containsKey(Constant.EXTRA_BLOCKCHAIN_DATA)) { - tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(Constant.EXTRA_BLOCKCHAIN_DATA)); - } else { - tangemContext.coinData = CoinEngineFactory.INSTANCE.create(tangemContext).createCoinData(); - } - } - tangemContext.error = bundle.getString("Error"); - tangemContext.message = bundle.getString("Message"); + tangemContext.coinData = CoinEngineFactory.INSTANCE.createCardano(tangemContext).createCoinData(); + +// if (tangemContext.getBlockchain() != null) { +// if (bundle.containsKey(Constant.EXTRA_BLOCKCHAIN_DATA)) { +// tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(Constant.EXTRA_BLOCKCHAIN_DATA)); +// } else { +// tangemContext.coinData = CoinEngineFactory.INSTANCE.create(tangemContext).createCoinData(); +// } +// } +// tangemContext.error = bundle.getString("Error"); +// tangemContext.message = bundle.getString("Message"); return tangemContext; } diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt index 32162b2c0b..988ea12c28 100644 --- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt +++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt @@ -38,6 +38,12 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac ctx.saveToIntent(intent) return intent } + + fun callingIntent(context: Context): Intent { + val intent = Intent(context, PrepareTransactionActivity::class.java) +// ctx.saveToIntent(intent) + return intent + } } @Inject