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-11-28 17:39:55 +03:00
parent 298655ec12
commit 04c776353d
5 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/tangem/di/Navigator.kt
View file

@ -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) {

2
app/src/main/java/com/tangem/domain/wallet/TangemContext.java
View file

@ -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;

8
app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
View file

@ -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 {

7
app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
View file

@ -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
}
}

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

@ -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 {