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-10-11 13:44:05 +03:00
parent f9ae052271
commit 9a581176fa
3 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
View file

@ -19,10 +19,7 @@ import com.tangem.data.network.model.InfuraResponse
import com.tangem.data.network.ElectrumRequest
import com.tangem.domain.cardReader.NfcManager
import com.tangem.domain.wallet.*
import com.tangem.util.BTCUtils
import com.tangem.util.DerEncodingUtil
import com.tangem.util.FormatUtil
import com.tangem.util.Util
import com.tangem.util.*
import com.tangem.wallet.R
import kotlinx.android.synthetic.main.activity_confirm_payment.*
import org.json.JSONException
@ -342,11 +339,19 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
}
private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
if (UtilHelper.isOnline(this)) {
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
} else {
Toast.makeText(this, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
}
}
private fun requestInfura(method: String) {
serverApiHelper!!.infura(method, 67, card!!.wallet, "", "")
if (UtilHelper.isOnline(this)) {
serverApiHelper!!.infura(method, 67, card!!.wallet, "", "")
} else {
Toast.makeText(this, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
}
}
public override fun onResume() {

15
app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
View file

@ -16,12 +16,13 @@ import com.tangem.domain.cardReader.NfcManager
import com.tangem.domain.wallet.Blockchain
import com.tangem.domain.wallet.CoinEngineFactory
import com.tangem.domain.wallet.TangemCard
import com.tangem.util.UtilHelper
import com.tangem.wallet.R
import org.json.JSONException
import java.io.IOException
import java.math.BigInteger
class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
companion object {
const val EXTRA_UID: String = "UID"
@ -156,11 +157,19 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback
}
private fun requestInfura(method: String, contract: String) {
serverApiHelper!!.infura(method, 67, card!!.wallet, contract, tx)
if (UtilHelper.isOnline(this)) {
serverApiHelper!!.infura(method, 67, card!!.wallet, contract, tx)
} else {
Toast.makeText(this, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
}
}
private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
if (UtilHelper.isOnline(this)) {
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
} else {
Toast.makeText(this, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
}
}
fun finishWithError(message: String) {

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

@ -296,7 +296,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
// request card verify listener
serverApiHelper!!.setCardVerifyAndGetInfoListener {
requestCounter--
if (requestCounter == 0) srl.isRefreshing = false
@ -497,9 +496,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}
private fun requestCardVerify() {
if ((card!!.isOnlineVerified == null || !card!!.isOnlineVerified)) {
requestCounter++
serverApiHelper!!.cardVerifyAndGetInfo(card)
if (UtilHelper.isOnline(activity!!)) {
if ((card!!.isOnlineVerified == null || !card!!.isOnlineVerified)) {
requestCounter++
serverApiHelper!!.cardVerifyAndGetInfo(card)
}
} else {
Toast.makeText(activity!!, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
srl.isRefreshing = false