diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index f704dc8b1b..fd0ffb52e5 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -3,6 +3,7 @@ package com.tangem.di import android.app.Activity import android.nfc.Tag import android.os.Bundle +import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.activity.EmptyWalletActivity import com.tangem.presentation.activity.LoadedWalletActivity @@ -24,8 +25,8 @@ class Navigator { context.startActivity(EmptyWalletActivity.callingIntent(context)) } - fun showVerifyCard(context: Activity, card: TangemCard) { - context.startActivityForResult(VerifyCardActivity.callingIntent(context, card), LoadedWallet.REQUEST_CODE_VERIFY_CARD) + fun showVerifyCard(context: Activity, card: TangemCard, coinData: CoinData, message: String, error: String) { + context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData, message, error), LoadedWallet.REQUEST_CODE_VERIFY_CARD) } // fun showPreparePayment(context: Activity) { diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java index ba690c011d..c3f34a86bc 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -6,7 +6,7 @@ import android.os.Bundle; public class TangemContext { - private static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"; + public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"; private Context context; private TangemCard card; private CoinData coinData; 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 9ca4cde339..e31879e9cc 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -192,10 +192,10 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card progressBar!!.post { progressBar!!.progress = 100 progressBar!!.progressTintList = ColorStateList.valueOf(Color.GREEN) - val intent = Intent(this@EmptyWalletActivity, VerifyCardActivity::class.java) - intent.putExtra("UID", cardProtocol.card.uid) - intent.putExtra("Card", cardProtocol.card.asBundle) - startActivityForResult(intent, REQUEST_CODE_VERIFY_CARD) +// val intent = Intent(this@EmptyWalletActivity, VerifyCardActivity::class.java) +// intent.putExtra("UID", cardProtocol.card.uid) +// intent.putExtra("Card", cardProtocol.card.asBundle) +// startActivityForResult(intent, REQUEST_CODE_VERIFY_CARD) //addCard(cardProtocol.getCard()); } } else { 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 83a1201252..2ec2b8f723 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -6,7 +6,9 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import com.tangem.App import com.tangem.di.Navigator +import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard +import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.fragment.VerifyCard import com.tangem.wallet.R import javax.inject.Inject @@ -17,10 +19,13 @@ class VerifyCardActivity : AppCompatActivity() { lateinit var navigator: Navigator companion object { - fun callingIntent(context: Context, card: TangemCard): Intent { + fun callingIntent(context: Context, card: TangemCard, coinData: CoinData, message: String, error: String): Intent { val intent = Intent(context, VerifyCardActivity::class.java) intent.putExtra(TangemCard.EXTRA_UID, card.uid) intent.putExtra(TangemCard.EXTRA_CARD, card.asBundle) + intent.putExtra(TangemContext.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle()) + intent.putExtra("Message", message) + intent.putExtra("Error", error) return intent } } 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 ddfb50551a..7346f13445 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -191,8 +191,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } btnDetails.setOnClickListener { if (cardProtocol != null) - openVerifyCard(cardProtocol!!) -// (activity as LoadedWalletActivity).navigator.showVerifyCard(activity, ctx.card) +// openVerifyCard(cardProtocol!!) + (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData, ctx.message, ctx.error) else showSingleToast(R.string.need_attach_card_again) @@ -882,11 +882,13 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } - private fun openVerifyCard(cardProtocol: CardProtocol) { - val intent = Intent(activity, VerifyCardActivity::class.java) - ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_VERIFY_CARD) - } +// private fun openVerifyCard(cardProtocol: CardProtocol) { +// val intent = Intent(activity, VerifyCardActivity::class.java) +// ctx.saveToIntent(intent) +// startActivityForResult(intent, REQUEST_CODE_VERIFY_CARD) +// +// ctx.coinData +// } private fun startVerify(tag: Tag?) { try {