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

Remove email from BankAccontPayload

Browse source
This commit is contained in:
Manfred Karrer 2017-11-14 22:18:05 -05:00
parent 4681574e21
commit 73865ec8b8
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
4 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bisq/core/payment/payload/BankAccountPayload.java
View file

@ -50,8 +50,6 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
protected String holderTaxId; protected String holderTaxId;
@Nullable @Nullable
protected String bankId; protected String bankId;
@Nullable
protected String email; // not used anymore but need to keep it for backward compatibility. get set by subclasses to empty string
public BankAccountPayload(String paymentMethod, String id) { public BankAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id); super(paymentMethod, id);
@ -72,7 +70,6 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
String accountType, String accountType,
String holderTaxId, String holderTaxId,
String bankId, String bankId,
String email,
long maxTradePeriod, long maxTradePeriod,
@Nullable Map<String, String> excludeFromJsonDataMap) { @Nullable Map<String, String> excludeFromJsonDataMap) {
super(paymentMethodName, super(paymentMethodName,
@ -88,7 +85,6 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
this.accountType = accountType; this.accountType = accountType;
this.holderTaxId = holderTaxId; this.holderTaxId = holderTaxId;
this.bankId = bankId; this.bankId = bankId;
this.email = email;
} }
@Override @Override
@ -102,7 +98,6 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
Optional.ofNullable(accountNr).ifPresent(builder::setAccountNr); Optional.ofNullable(accountNr).ifPresent(builder::setAccountNr);
Optional.ofNullable(accountType).ifPresent(builder::setAccountType); Optional.ofNullable(accountType).ifPresent(builder::setAccountType);
Optional.ofNullable(bankId).ifPresent(builder::setBankId); Optional.ofNullable(bankId).ifPresent(builder::setBankId);
Optional.ofNullable(email).ifPresent(builder::setEmail);
final PB.CountryBasedPaymentAccountPayload.Builder countryBasedPaymentAccountPayloadBuilder = super.getPaymentAccountPayloadBuilder() final PB.CountryBasedPaymentAccountPayload.Builder countryBasedPaymentAccountPayloadBuilder = super.getPaymentAccountPayloadBuilder()
.getCountryBasedPaymentAccountPayloadBuilder() .getCountryBasedPaymentAccountPayloadBuilder()
.setBankAccountPayload(builder); .setBankAccountPayload(builder);

4
core/src/main/java/io/bisq/core/payment/payload/NationalBankAccountPayload.java
View file

@ -35,7 +35,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
public NationalBankAccountPayload(String paymentMethod, String id) { public NationalBankAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id); super(paymentMethod, id);
email = ""; //email must not be null but empty string, otherwise hash check fails for contract
} }
@ -53,7 +52,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
String accountType, String accountType,
String holderTaxId, String holderTaxId,
String bankId, String bankId,
String email,
long maxTradePeriod, long maxTradePeriod,
@Nullable Map<String, String> excludeFromJsonDataMap) { @Nullable Map<String, String> excludeFromJsonDataMap) {
super(paymentMethodName, super(paymentMethodName,
@ -66,7 +64,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
accountType, accountType,
holderTaxId, holderTaxId,
bankId, bankId,
email,
maxTradePeriod, maxTradePeriod,
excludeFromJsonDataMap); excludeFromJsonDataMap);
} }
@ -100,7 +97,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
bankAccountPayloadPB.getAccountType().isEmpty() ? null : bankAccountPayloadPB.getAccountType(), bankAccountPayloadPB.getAccountType().isEmpty() ? null : bankAccountPayloadPB.getAccountType(),
bankAccountPayloadPB.getHolderTaxId().isEmpty() ? null : bankAccountPayloadPB.getHolderTaxId(), bankAccountPayloadPB.getHolderTaxId().isEmpty() ? null : bankAccountPayloadPB.getHolderTaxId(),
bankAccountPayloadPB.getBankId().isEmpty() ? null : bankAccountPayloadPB.getBankId(), bankAccountPayloadPB.getBankId().isEmpty() ? null : bankAccountPayloadPB.getBankId(),
bankAccountPayloadPB.getEmail().isEmpty() ? "" : bankAccountPayloadPB.getEmail(),
proto.getMaxTradePeriod(), proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap())); CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));
} }

4
core/src/main/java/io/bisq/core/payment/payload/SameBankAccountPayload.java
View file

@ -35,7 +35,6 @@ public final class SameBankAccountPayload extends BankAccountPayload {
public SameBankAccountPayload(String paymentMethod, String id) { public SameBankAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id); super(paymentMethod, id);
email = ""; //email must not be null but empty string, otherwise hash check fails for contract
} }
@ -53,7 +52,6 @@ public final class SameBankAccountPayload extends BankAccountPayload {
String accountType, String accountType,
String holderTaxId, String holderTaxId,
String bankId, String bankId,
String email,
long maxTradePeriod, long maxTradePeriod,
@Nullable Map<String, String> excludeFromJsonDataMap) { @Nullable Map<String, String> excludeFromJsonDataMap) {
super(paymentMethodName, super(paymentMethodName,
@ -66,7 +64,6 @@ public final class SameBankAccountPayload extends BankAccountPayload {
accountType, accountType,
holderTaxId, holderTaxId,
bankId, bankId,
email,
maxTradePeriod, maxTradePeriod,
excludeFromJsonDataMap); excludeFromJsonDataMap);
@ -101,7 +98,6 @@ public final class SameBankAccountPayload extends BankAccountPayload {
bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(), bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(),
bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(), bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(),
bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(), bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(),
bankAccountPayload.getEmail().isEmpty() ? "" : bankAccountPayload.getEmail(),
proto.getMaxTradePeriod(), proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap())); CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));
} }

4
core/src/main/java/io/bisq/core/payment/payload/SpecificBanksAccountPayload.java
View file

@ -41,7 +41,6 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
public SpecificBanksAccountPayload(String paymentMethod, String id) { public SpecificBanksAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id); super(paymentMethod, id);
email = ""; //email must not be null but empty string, otherwise hash check fails for contract
} }
@ -59,7 +58,6 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
String accountType, String accountType,
String holderTaxId, String holderTaxId,
String bankId, String bankId,
String email,
ArrayList<String> acceptedBanks, ArrayList<String> acceptedBanks,
long maxTradePeriod, long maxTradePeriod,
@Nullable Map<String, String> excludeFromJsonDataMap) { @Nullable Map<String, String> excludeFromJsonDataMap) {
@ -73,7 +71,6 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
accountType, accountType,
holderTaxId, holderTaxId,
bankId, bankId,
email,
maxTradePeriod, maxTradePeriod,
excludeFromJsonDataMap); excludeFromJsonDataMap);
@ -113,7 +110,6 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(), bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(),
bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(), bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(),
bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(), bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(),
bankAccountPayload.getEmail().isEmpty() ? "" : bankAccountPayload.getEmail(),
new ArrayList<>(specificBanksAccountPayload.getAcceptedBanksList()), new ArrayList<>(specificBanksAccountPayload.getAcceptedBanksList()),
proto.getMaxTradePeriod(), proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap())); CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));