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 12:39:58 +03:00
parent 6c8c365317
commit 922610a9ed
7 changed files with 50 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import android.view.KeyEvent
import android.view.View
import android.widget.*
import com.tangem.data.network.ServerApiHelper
import com.tangem.data.network.ServerApiHelperElectrum
import com.tangem.data.network.model.InfuraResponse
import com.tangem.data.network.request.ElectrumRequest
import com.tangem.domain.cardReader.NfcManager
@ -39,6 +40,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
private var nfcManager: NfcManager? = null
private var serverApiHelper: ServerApiHelper? = null
private var serverApiHelperElectrum: ServerApiHelperElectrum? = null
var card: TangemCard? = null
var feeRequestSuccess = false
var balanceRequestSuccess = false
@ -218,7 +220,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
}
// request electrum listener
serverApiHelper!!.setElectrumRequestData {
serverApiHelperElectrum!!.setElectrumRequestData {
if (it.isMethod(ElectrumRequest.METHOD_GetBalance)) {
try {
etFee!!.setText("--")
@ -340,7 +342,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
}
private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
serverApiHelper!!.electrumRequestData(card, electrumRequest)
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
}
private fun requestInfura(method: String) {

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

@ -9,6 +9,7 @@ import android.util.Log
import android.view.KeyEvent
import android.widget.Toast
import com.tangem.data.network.ServerApiHelper
import com.tangem.data.network.ServerApiHelperElectrum
import com.tangem.data.network.model.InfuraResponse
import com.tangem.data.network.request.ElectrumRequest
import com.tangem.domain.cardReader.NfcManager
@ -29,6 +30,8 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback
}
private var serverApiHelper: ServerApiHelper? = null
private var serverApiHelperElectrum: ServerApiHelperElectrum? = null
var card: TangemCard? = null
private var tx: String? = null
private var nfcManager: NfcManager? = null
@ -42,6 +45,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback
nfcManager = NfcManager(this, this)
serverApiHelper = ServerApiHelper()
serverApiHelperElectrum = ServerApiHelperElectrum()
val intent = intent
card = TangemCard(getIntent().getStringExtra(EXTRA_UID))
@ -63,7 +67,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback
}
// request electrum listener
serverApiHelper!!.setElectrumRequestData {
serverApiHelperElectrum!!.setElectrumRequestData {
if (it.isMethod(ElectrumRequest.METHOD_SendTransaction)) {
try {
var hashTX = it.resultString
@ -156,7 +160,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback
}
private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
serverApiHelper!!.electrumRequestData(card, electrumRequest)
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
}
fun finishWithError(message: String) {

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

@ -22,6 +22,7 @@ import android.view.ViewGroup
import android.widget.Toast
import com.google.zxing.WriterException
import com.tangem.data.network.ServerApiHelper
import com.tangem.data.network.ServerApiHelperElectrum
import com.tangem.data.network.model.InfuraResponse
import com.tangem.data.network.request.ElectrumRequest
import com.tangem.data.nfc.VerifyCardTask
@ -59,6 +60,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
private var singleToast: Toast? = null
private var nfcManager: NfcManager? = null
private var serverApiHelper: ServerApiHelper? = null
private var serverApiHelperElectrum: ServerApiHelperElectrum? = null
var card: TangemCard? = null
private var lastTag: Tag? = null
var srlLoadedWallet: SwipeRefreshLayout? = null
@ -84,6 +86,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
nfcManager = NfcManager(activity, this)
serverApiHelper = ServerApiHelper()
serverApiHelperElectrum = ServerApiHelperElectrum()
sp = PreferenceManager.getDefaultSharedPreferences(activity)
@ -219,7 +222,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}
// request electrum listener
serverApiHelper!!.setElectrumRequestData {
serverApiHelperElectrum!!.setElectrumRequestData {
requestCounter--
if (requestCounter == 0) srlLoadedWallet!!.isRefreshing = false
@ -233,7 +236,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
card!!.setBalanceConfirmed(confBalance)
card!!.balanceUnconfirmed = unconfirmedBalance
card!!.decimalBalance = confBalance.toString()
card!!.validationNodeDescription = serverApiHelper!!.validationNodeDescription
card!!.validationNodeDescription = serverApiHelperElectrum!!.validationNodeDescription
} catch (e: JSONException) {
e.printStackTrace()
engine.switchNode(card)
@ -476,7 +479,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
requestCounter++
serverApiHelper!!.electrumRequestData(card, electrumRequest)
serverApiHelperElectrum!!.electrumRequestData(card, electrumRequest)
}
private fun requestInfura(method: String, contract: String) {