github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2024-11-23 05:33:29 +01:00
Code Releases Activity

always apply tx_amount from qr code (#687)

Browse Source
This commit is contained in:
m2049r 2020-09-27 11:00:57 +02:00 committed by GitHub
parent 7206857a5b
commit e5b15b7816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
View File

@ -148,12 +148,9 @@ public class SendAmountWizardFragment extends SendWizardFragment {
tvFunds.setText(getString(R.string.send_available, tvFunds.setText(getString(R.string.send_available,
getString(R.string.unknown_amount))); getString(R.string.unknown_amount)));
} }
// getNativeAmount is null if exchange is in progress final BarcodeData data = sendListener.popBarcodeData();
if ((etAmount.getNativeAmount() != null) && etAmount.getNativeAmount().isEmpty()) { if ((data != null) && (data.amount != null)) {
final BarcodeData data = sendListener.popBarcodeData(); etAmount.setAmount(data.amount);
if ((data != null) && (data.amount != null)) {
etAmount.setAmount(data.amount);
}
} }
} }