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-12 19:48:16 +03:00
commit b690338759
14 changed files with 121 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
public boolean balanceRequestSuccess = false;
private EditText etWallet;
// private TextView tvAmountEquivalent;
// private TextView tvFeeEquivalent;
private TextView tvFeeEquivalent;
public EditText etAmount;
public EditText etFee;
private ImageView ivCamera;
@ -95,7 +95,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
etFee = findViewById(R.id.etFee);
// TextView tvBalanceEquivalent = findViewById(R.id.tvBalanceEquivalent);
// tvAmountEquivalent = findViewById(R.id.tvAmountEquivalent);
// tvFeeEquivalent = findViewById(R.id.tvFeeEquivalent);
tvFeeEquivalent = findViewById(R.id.tvFeeEquivalent);
ivCamera = findViewById(R.id.ivCamera);
rgFee = findViewById(R.id.rgFee);
@ -138,21 +138,21 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
// try {
//
// CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());
// String eqFee = engine.EvaluteFeeEquivalent(mCard, etFee.getText().toString());
// tvFeeEquivalent.setText(eqFee);
//
// if (!mCard.getAmountEquivalentDescriptionAvailable()) {
// tvFeeEquivalent.setError("Service unavailable");
// } else {
// tvFeeEquivalent.setError(null);
// }
// } catch (Exception e) {
// e.printStackTrace();
// tvFeeEquivalent.setText("");
// }
try {
CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());
String eqFee = engine.EvaluteFeeEquivalent(mCard, etFee.getText().toString());
tvFeeEquivalent.setText(eqFee);
if (!mCard.getAmountEquivalentDescriptionAvailable()) {
tvFeeEquivalent.setError("Service unavailable");
} else {
tvFeeEquivalent.setError(null);
}
} catch (Exception e) {
e.printStackTrace();
tvFeeEquivalent.setText("");
}
}
@Override

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

@ -47,12 +47,12 @@ public class SendTransactionActivity extends AppCompatActivity {
} else if (mCard.getBlockchain() == Blockchain.Bitcoin || mCard.getBlockchain() == Blockchain.BitcoinTestNet) {
String nodeAddress = engine.GetNode(mCard);
int nodePort = engine.GetNodePort(mCard);
ConnectTask connectTask = new ConnectTask(SendTransactionActivity.this, nodeAddress, nodePort);
ConnectTask connectTask = new ConnectTask(SendTransactionActivity.this, nodeAddress, nodePort,3);
connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx));
} else if (mCard.getBlockchain() == Blockchain.BitcoinCash || mCard.getBlockchain() == Blockchain.BitcoinCashTestNet) {
String nodeAddress = engine.GetNode(mCard);
int nodePort = engine.GetNodePort(mCard);
ConnectTask connectTask = new ConnectTask(SendTransactionActivity.this, nodeAddress, nodePort);
ConnectTask connectTask = new ConnectTask(SendTransactionActivity.this, nodeAddress, nodePort,3);
connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx));
}
@ -70,7 +70,7 @@ public class SendTransactionActivity extends AppCompatActivity {
public void finishWithError(String Message) {
Intent intent = new Intent();
intent.putExtra("message", "Failed to send transaction. Try again.");
intent.putExtra("message", "Try again. Failed to send transaction (" + Message + ")");
setResult(MainActivity.RESULT_CANCELED, intent);
finish();
}

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

@ -680,7 +680,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
tvMessage.setVisibility(View.GONE);
} else {
if (needResendTX) {
tvMessage.setText(R.string.sending_cached_transaction);
//tvMessage.setText(R.string.sending_cached_transaction);
} else {
tvMessage.setText(mCard.getMessage());
}