Updated on 2026-08-14

This commit is contained in:
Tangem 2018-07-03 14:52:46 +03:00
parent b6517aeac0
commit c19268210d
5 changed files with 22 additions and 7 deletions

Binary file not shown.

View file

@ -15,7 +15,7 @@ android {
applicationId "com.tangem.wallet"
minSdkVersion 21
targetSdkVersion 27
versionCode 31
versionCode 32
versionName "0.85.5." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

View file

@ -429,7 +429,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
} else {
tvBalance.setText(engine.GetBalanceWithAlter(mCard));
}
etAmount.setText(getIntent().getStringExtra("Amount"));
etAmount.setText(getIntent().getStringExtra(SignPaymentActivity.EXTRA_AMOUNT));
tvCurrency.setText(engine.GetBalanceCurrency(mCard));
tvCurrency2.setText(engine.GetFeeCurrency());
@ -593,7 +593,11 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
intent.putExtra("UID", mCard.getUID());
intent.putExtra("Card", mCard.getAsBundle());
intent.putExtra("Wallet", etWallet.getText().toString());
intent.putExtra("Amount", etAmount.getText().toString());
intent.putExtra(SignPaymentActivity.EXTRA_AMOUNT, etAmount.getText().toString());
// if (BuildConfig.DEBUG)
// Toast.makeText(this, etAmount.getText().toString(), Toast.LENGTH_LONG).show();
intent.putExtra("Fee", etFee.getText().toString());
startActivityForResult(intent, REQUEST_CODE_SIGN_PAYMENT);
} else {

View file

@ -16,6 +16,7 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.wallet.Blockchain;
@ -23,6 +24,7 @@ import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.util.FormatUtil;
import com.tangem.wallet.BuildConfig;
import com.tangem.wallet.R;
import java.io.IOException;
@ -104,6 +106,7 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
// e.printStackTrace();
// tvAmountEquivalent.setText("");
// }
}
@Override
@ -136,7 +139,11 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
btnVerify.setOnClickListener(v -> {
String strAmount;
strAmount = etAmount.getText().toString().replace(",",".");
strAmount = etAmount.getText().toString().replace(",", ".");
if (BuildConfig.DEBUG)
Toast.makeText(this, strAmount, Toast.LENGTH_LONG).show();
CoinEngine engine1 = CoinEngineFactory.Create(mCard.getBlockchain());
Log.i(TAG, mCard.getBlockchain().getOfficialName());
@ -150,7 +157,11 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
return;
}
boolean checkAddress = engine1.ValdateAddress(etWallet.getText().toString(), mCard);
boolean checkAddress = false;
if (engine1 != null) {
checkAddress = engine1.ValdateAddress(etWallet.getText().toString(), mCard);
}
if (!checkAddress) {
etWallet.setError(getString(R.string.incorrect_destination_wallet_address));
return;
@ -165,7 +176,7 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
intent.putExtra("UID", mCard.getUID());
intent.putExtra("Card", mCard.getAsBundle());
intent.putExtra("Wallet", etWallet.getText().toString());
intent.putExtra("Amount", strAmount);
intent.putExtra(SignPaymentActivity.EXTRA_AMOUNT, strAmount);
startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT);
});

File diff suppressed because one or more lines are too long