mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added check for empty validation

Browse source 
This commit is for github issue #3458 and #3459
check added for moneybeam and national bank transfer
This commit is contained in:
beingindot 2019-11-07 13:04:33 +05:30
parent 61e51a0b7a
commit 755ca19ef6
No known key found for this signature in database
GPG key ID: 66884C4B3A4B5942
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/bisq/core/util/validation/InputValidator.java
View file

@ -28,7 +28,8 @@ public class InputValidator {
} }
protected ValidationResult validateIfNotEmpty(String input) { protected ValidationResult validateIfNotEmpty(String input) {
if (input == null || input.length() == 0) //trim added to avoid empty input
if (input == null || input.trim().length() == 0)
return new ValidationResult(false, Res.get("validation.empty")); return new ValidationResult(false, Res.get("validation.empty"));
else else
return new ValidationResult(true); return new ValidationResult(true);

10
desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
View file

@ -240,28 +240,28 @@ abstract class BankForm extends GeneralBankForm {
bankNameInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.bank.name")); bankNameInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.bank.name"));
bankNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { bankNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
bankAccountPayload.setBankName(newValue); bankAccountPayload.setBankName(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });
bankIdInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel("")); bankIdInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel(""));
bankIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { bankIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
bankAccountPayload.setBankId(newValue); bankAccountPayload.setBankId(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });
branchIdInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel("")); branchIdInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(""));
branchIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { branchIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
bankAccountPayload.setBranchId(newValue); bankAccountPayload.setBranchId(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });
accountNrInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel("")); accountNrInputTextField = addInputTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel(""));
accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
bankAccountPayload.setAccountNr(newValue); bankAccountPayload.setAccountNr(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });
@ -381,7 +381,7 @@ abstract class BankForm extends GeneralBankForm {
holderNameInputTextField = tuple.first; holderNameInputTextField = tuple.first;
holderNameInputTextField.setMinWidth(250); holderNameInputTextField.setMinWidth(250);
holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
bankAccountPayload.setHolderName(newValue); bankAccountPayload.setHolderName(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });
holderNameInputTextField.minWidthProperty().bind(currencyComboBox.widthProperty()); holderNameInputTextField.minWidthProperty().bind(currencyComboBox.widthProperty());

13
desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java
View file

@ -117,7 +117,7 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
bankNameInputTextField.setValidator(null); bankNameInputTextField.setValidator(null);
bankIdInputTextField.setValidator(null); bankIdInputTextField.setValidator(null);
branchIdInputTextField.setValidator(null); branchIdInputTextField.setValidator(null);
accountNrInputTextField.setValidator(null); accountNrInputTextField.setValidator(inputValidator);
nationalAccountIdInputTextField.setValidator(null); nationalAccountIdInputTextField.setValidator(null);
} }
} }
@ -142,20 +142,20 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
if (countryCode == null) if (countryCode == null)
countryCode = ""; countryCode = "";
if (BankUtil.isBankIdRequired(countryCode)) { if (BankUtil.isBankIdRequired(countryCode)) {
bankId = bankIdInputTextField.getText(); bankId = bankIdInputTextField.getText().trim();
if (bankId.length() > 9) if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9); bankId = StringUtils.abbreviate(bankId, 9);
} else if (BankUtil.isBranchIdRequired(countryCode)) { } else if (BankUtil.isBranchIdRequired(countryCode)) {
bankId = branchIdInputTextField.getText(); bankId = branchIdInputTextField.getText().trim();
if (bankId.length() > 9) if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9); bankId = StringUtils.abbreviate(bankId, 9);
} else if (BankUtil.isBankNameRequired(countryCode)) { } else if (BankUtil.isBankNameRequired(countryCode)) {
bankId = bankNameInputTextField.getText(); bankId = bankNameInputTextField.getText().trim();
if (bankId.length() > 9) if (bankId.length() > 9)
bankId = StringUtils.abbreviate(bankId, 9); bankId = StringUtils.abbreviate(bankId, 9);
} }
String accountNr = accountNrInputTextField.getText(); String accountNr = accountNrInputTextField.getText().trim();
if (accountNr.length() > 9) if (accountNr.length() > 9)
accountNr = StringUtils.abbreviate(accountNr, 9); accountNr = StringUtils.abbreviate(accountNr, 9);
@ -200,7 +200,10 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
if (BankUtil.isNationalAccountIdRequired(countryCode)) if (BankUtil.isNationalAccountIdRequired(countryCode))
result = result && nationalAccountIdInputTextField.getValidator().validate(nationalAccountId).isValid; result = result && nationalAccountIdInputTextField.getValidator().validate(nationalAccountId).isValid;
} else { // only account number not empty validation
result = result && accountNrInputTextField.getValidator().validate(accountNr).isValid;
} }
return result; return result;
} }
} }

2
desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
View file

@ -62,7 +62,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId")); accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"));
accountIdInputTextField.setValidator(validator); accountIdInputTextField.setValidator(validator);
accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
account.setAccountId(newValue); account.setAccountId(newValue.trim());
updateFromInputs(); updateFromInputs();
}); });

1
desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
View file

@ -281,6 +281,7 @@ public abstract class PaymentMethodForm {
void setAccountNameWithString(String name) { void setAccountNameWithString(String name) {
if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) { if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) {
name = name.trim();
name = StringUtils.abbreviate(name, 9); name = StringUtils.abbreviate(name, 9);
String method = Res.get(paymentAccount.getPaymentMethod().getId()); String method = Res.get(paymentAccount.getPaymentMethod().getId());
accountNameTextField.setText(method.concat(": ").concat(name)); accountNameTextField.setText(method.concat(": ").concat(name));