From 6674f894b77fbc9cf3fb0e8275f32e542f62550d Mon Sep 17 00:00:00 2001 From: pokkst Date: Wed, 7 Sep 2022 20:00:14 -0500 Subject: [PATCH] Fix sendAll bug --- .../xmrwallet/fragment/dialog/SendBottomSheetDialog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/dialog/SendBottomSheetDialog.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/dialog/SendBottomSheetDialog.java index 010facc..4a05da0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/dialog/SendBottomSheetDialog.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/dialog/SendBottomSheetDialog.java @@ -56,21 +56,22 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment { }); sendButton.setOnClickListener(view1 -> { + boolean sendAll = sendingMax.getValue() != null ? sendingMax.getValue() : false; String address = addressEditText.getText().toString().trim(); String amount = amountEditText.getText().toString().trim(); boolean validAddress = Wallet.isAddressValid(address); - if (validAddress && !amount.isEmpty()) { + if (validAddress && (!amount.isEmpty() || sendAll)) { long amountRaw = Wallet.getAmountFromString(amount); long balance = BalanceService.getInstance().getUnlockedBalanceRaw(); - if(amountRaw >= balance || amountRaw <= 0) { + if((amountRaw >= balance || amountRaw <= 0) && !sendAll) { Toast.makeText(getActivity(), getString(R.string.send_amount_invalid), Toast.LENGTH_SHORT).show(); + return; } sendButton.setEnabled(false); - boolean sendAll = sendingMax.getValue() != null ? sendingMax.getValue() : false; TxService.getInstance().sendTx(address, amount, sendAll); } else if (!validAddress) { Toast.makeText(getActivity(), getString(R.string.send_address_invalid), Toast.LENGTH_SHORT).show(); - } else if (amount.isEmpty()) { + } else { Toast.makeText(getActivity(), getString(R.string.send_amount_empty), Toast.LENGTH_SHORT).show(); } });