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-07-24 20:38:25 +03:00
parent dc14c2c0bc
commit b0646dcec0
3 changed files with 10 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java
View file

@ -56,7 +56,7 @@ public class CardListAdapter extends RecyclerView.Adapter<CardListAdapter.CardVi
tvType = itemView.findViewById(R.id.tvType);
tvTypeBg = itemView.findViewById(R.id.tvTypeBg);
tvVoid = itemView.findViewById(R.id.tvVoid);
tvInputs = itemView.findViewById(R.id.tvInputs);
// tvInputs = itemView.findViewById(R.id.tvInputs);
tvLastInput = itemView.findViewById(R.id.tvLastInput);
lbLastInput = itemView.findViewById(R.id.lbLastInput);
lbLastOutput = itemView.findViewById(R.id.lbLastOutput);

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

@ -137,7 +137,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
val visibleFlag = engine?.InOutPutVisible() ?: true
val visibleIOPuts = if (visibleFlag) View.VISIBLE else View.GONE
tvInputs.visibility = visibleIOPuts
// tvInputs.visibility = visibleIOPuts
try {
ivQR.setImageBitmap(UtilHelper.generateQrCode(engine!!.getShareWalletURI(mCard).toString()))
@ -497,14 +497,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
if (needResendTX)
sendTransaction(LastSignStorage.getTxForSend(mCard!!.wallet))
// if (activity!!.intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) {
// val tag = activity!!.intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
// if (tag != null) {
// onTagDiscovered(tag)
// }
// }
}
override fun onTagDiscovered(tag: Tag) {
@ -630,8 +622,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
tvBalance.text = engine.GetBalanceWithAlter(mCard)
}
tvBalanceEquivalent.text = engine.GetBalanceEquivalent(mCard)
tvOffline.visibility = View.INVISIBLE
} else {
val offlineAmount = engine.ConvertByteArrayToAmount(mCard, mCard!!.offlineBalance)
if (mCard!!.blockchain == Blockchain.Token) {
@ -639,34 +629,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
} else {
tvBalance.text = engine.GetAmountDescription(mCard, offlineAmount)
}
tvBalanceEquivalent.text = engine.GetAmountEqualentDescriptor(mCard, offlineAmount)
tvOffline.visibility = View.VISIBLE
}
if (!mCard!!.amountEquivalentDescriptionAvailable) {
} else {
tvBalanceEquivalent.error = null
}
tvWallet.text = mCard!!.wallet
tvInputs.text = mCard!!.inputsDescription
when {
mCard!!.lastInputDescription.contains("awaiting") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed))
mCard!!.lastInputDescription.contains("None") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.primary_dark))
else -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed))
}
tvBlockchain.text = mCard!!.blockchainName
tvValidationNode.text = mCard!!.validationNodeDescription
btnExtract!!.isEnabled = mCard!!.hasBalanceInfo()
tvIssuer.text = mCard!!.issuerDescription
mCard!!.error = null
mCard!!.message = null