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-09-04 17:15:00 +03:00
parent 222be205ec
commit 63318efd8d
5 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/tangem/data/network/task/confirm_payment/ETHRequestTask.java
View file

@ -46,20 +46,22 @@ public class ETHRequestTask extends InfuraTask {
BigInteger m = confirmPaymentActivity.getCard().getBlockchain() == Blockchain.Token ? BigInteger.valueOf(55000) : BigInteger.valueOf(21000);
l = l.multiply(m);
String feeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l));
String MinFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l));
String NormalFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l.multiply(BigInteger.valueOf(12)).divide(BigInteger.valueOf(10))));
String MaxFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l.multiply(BigInteger.valueOf(15)).divide(BigInteger.valueOf(10))));
Log.i("sjjoefeff", feeInGwei);
Log.i("sjjoefeff", MinFeeInGwei);
confirmPaymentActivity.setMinFee(feeInGwei);
confirmPaymentActivity.setMaxFee(feeInGwei);
confirmPaymentActivity.setNormalFee(feeInGwei);
confirmPaymentActivity.getEtFee().setText(feeInGwei);
confirmPaymentActivity.setMinFee(MinFeeInGwei);
confirmPaymentActivity.setNormalFee(NormalFeeInGwei);
confirmPaymentActivity.setMaxFee(MaxFeeInGwei);
confirmPaymentActivity.getEtFee().setText(NormalFeeInGwei);
confirmPaymentActivity.getEtFee().setError(null);
confirmPaymentActivity.getBtnSend().setVisibility(View.VISIBLE);
confirmPaymentActivity.setFeeRequestSuccess(true);
confirmPaymentActivity.setBalanceRequestSuccess(true);
confirmPaymentActivity.setDtVerified(new Date());
confirmPaymentActivity.setMinFeeInInternalUnits(confirmPaymentActivity.getCard().internalUnitsFromString(feeInGwei));
confirmPaymentActivity.setMinFeeInInternalUnits(confirmPaymentActivity.getCard().internalUnitsFromString(NormalFeeInGwei));
} catch (JSONException e) {
e.printStackTrace();

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

@ -17,10 +17,8 @@ import android.widget.*
import com.tangem.data.network.ServerApiHelper
import com.tangem.data.network.request.ElectrumRequest
import com.tangem.data.network.request.FeeRequest
import com.tangem.data.network.request.InfuraRequest
import com.tangem.data.network.task.confirm_payment.ConnectFeeTask
import com.tangem.data.network.task.confirm_payment.ConnectTask
import com.tangem.data.network.task.confirm_payment.ETHRequestTask
import com.tangem.domain.cardReader.NfcManager
import com.tangem.domain.wallet.*
import com.tangem.util.BTCUtils
@ -83,10 +81,10 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
} else
tvBalance.text = engine!!.getBalanceWithAlter(card)
if(intent.getBooleanExtra("IncFee", true)) {
tvIncFee!!.setText(R.string.feein);
if (intent.getBooleanExtra("IncFee", true)) {
tvIncFee!!.setText(R.string.including_fee)
} else {
tvIncFee!!.setText(R.string.feeout);
tvIncFee!!.setText(R.string.not_including_fee)
}
etAmount!!.setText(intent.getStringExtra(SignPaymentActivity.EXTRA_AMOUNT))
@ -221,20 +219,23 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
var gasPrice = it.result
gasPrice = gasPrice.substring(2)
var l = BigInteger(gasPrice, 16)
val m = if (card!!.blockchain == Blockchain.Token) BigInteger.valueOf(55000) else BigInteger.valueOf(21000)
l = l.multiply(m)
val feeInGwei = card!!.getAmountInGwei(l.toString())
val minFeeInGwei = card!!.getAmountInGwei(l.toString())
val normalFeeInGwei = card!!.getAmountInGwei(l.multiply(BigInteger.valueOf(12)).divide(BigInteger.valueOf(10)).toString())
val maxFeeInGwei = card!!.getAmountInGwei(l.multiply(BigInteger.valueOf(15)).divide(BigInteger.valueOf(10)).toString())
minFee = feeInGwei
maxFee = feeInGwei
normalFee = feeInGwei
etFee!!.setText(feeInGwei)
minFee = minFeeInGwei
normalFee = normalFeeInGwei
maxFee = maxFeeInGwei
etFee!!.setText(normalFeeInGwei)
etFee!!.error = null
btnSend!!.visibility = View.VISIBLE
feeRequestSuccess = true
balanceRequestSuccess = true
dtVerified = Date()
minFeeInInternalUnits = card!!.internalUnitsFromString(feeInGwei)
minFeeInInternalUnits = card!!.internalUnitsFromString(normalFeeInGwei)
// Log.i("eth_gas_price", feeInGwei)
}

4
app/src/main/res/layout/activity_confirm_payment.xml
View file

@ -134,11 +134,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:fontFamily="@font/maax"
android:text="@string/including_fee"
android:textColor="@color/primary"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/textView3"
app:layout_constraintLeft_toRightOf="@+id/textView3" />
app:layout_constraintLeft_toRightOf="@+id/textView3"
tools:text="(including fee)" />
</android.support.constraint.ConstraintLayout>

4
app/src/main/res/layout/activity_prepare_payment.xml
View file

@ -228,7 +228,7 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/feein"
android:text="@string/including_fee_"
android:textSize="@dimen/text_size_medium" />
<RadioButton
@ -237,7 +237,7 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/feeout"
android:text="@string/not_including_fee_"
android:textSize="@dimen/text_size_medium" />
</info.hoang8f.android.segmented.SegmentedGroup>

8
app/src/main/res/values/strings.xml
View file

@ -39,7 +39,7 @@
<string name="with_balance">with balance</string>
<string name="send_to_wallet">Send to wallet</string>
<string name="amount">Amount</string>
<string name="including_fee">(including fee)</string>
<!--<string name="including_fee">(including fee)</string>-->
<string name="m_btc">mBTC</string>
<string name="scan_again_to_verify_the_card">Scan again to verify the card</string>
<string name="smart_cash_ag">Smart Cash AG</string>
@ -164,8 +164,10 @@
<string name="minimal">Minimal</string>
<string name="normal">Normal</string>
<string name="priority">Priority</string>
<string name="feein">Including fee</string>
<string name="feeout">Not including fee</string>
<string name="including_fee_">Including fee</string>
<string name="not_including_fee_">Not including fee</string>
<string name="including_fee">(including fee)</string>
<string name="not_including_fee">(not including fee)</string>
<string name="the_obtained_data_is_outdated_try_again">The obtained data is outdated! Try again</string>
<string name="cannot_reach_current_active_blockchain_node_try_again">Cannot reach current active blockchain node. Try again</string>
<string name="cannot_check_balance_no_connection_with_blockchain_nodes">Cannot check balance! No connection with blockchain nodes</string>