diff --git a/core/src/main/java/io/bitsquare/payment/AliPayAccountContractData.java b/core/src/main/java/io/bitsquare/payment/AliPayAccountContractData.java index c9a0035c1c..44da9b2375 100644 --- a/core/src/main/java/io/bitsquare/payment/AliPayAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/AliPayAccountContractData.java @@ -25,7 +25,7 @@ public final class AliPayAccountContractData extends PaymentAccountContractData private String accountNr; - public AliPayAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public AliPayAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/BankAccountContractData.java b/core/src/main/java/io/bitsquare/payment/BankAccountContractData.java index b0a635ca00..5f0139e978 100644 --- a/core/src/main/java/io/bitsquare/payment/BankAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/BankAccountContractData.java @@ -40,7 +40,7 @@ public abstract class BankAccountContractData extends CountryBasedPaymentAccount @Nullable protected String holderTaxId; - public BankAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public BankAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/CountryBasedPaymentAccountContractData.java b/core/src/main/java/io/bitsquare/payment/CountryBasedPaymentAccountContractData.java index b313c6a093..360d726a72 100644 --- a/core/src/main/java/io/bitsquare/payment/CountryBasedPaymentAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/CountryBasedPaymentAccountContractData.java @@ -34,7 +34,7 @@ public abstract class CountryBasedPaymentAccountContractData extends PaymentAcco // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - CountryBasedPaymentAccountContractData(String paymentMethodName, String id, int maxTradePeriod) { + CountryBasedPaymentAccountContractData(String paymentMethodName, String id, long maxTradePeriod) { super(paymentMethodName, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/CryptoCurrencyAccountContractData.java b/core/src/main/java/io/bitsquare/payment/CryptoCurrencyAccountContractData.java index 44b4eeaeda..e23808e91e 100644 --- a/core/src/main/java/io/bitsquare/payment/CryptoCurrencyAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/CryptoCurrencyAccountContractData.java @@ -31,7 +31,7 @@ public final class CryptoCurrencyAccountContractData extends PaymentAccountContr @Nullable private String paymentId; - public CryptoCurrencyAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public CryptoCurrencyAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/NationalBankAccountContractData.java b/core/src/main/java/io/bitsquare/payment/NationalBankAccountContractData.java index 15323ce495..364b2fa3b3 100644 --- a/core/src/main/java/io/bitsquare/payment/NationalBankAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/NationalBankAccountContractData.java @@ -27,7 +27,7 @@ public final class NationalBankAccountContractData extends BankAccountContractDa private static final Logger log = LoggerFactory.getLogger(NationalBankAccountContractData.class); - public NationalBankAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public NationalBankAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java b/core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java index 5b33b525cd..51e8b2c2ab 100644 --- a/core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java @@ -25,7 +25,7 @@ public final class OKPayAccountContractData extends PaymentAccountContractData { private String accountNr; - public OKPayAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public OKPayAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/PaymentAccount.java b/core/src/main/java/io/bitsquare/payment/PaymentAccount.java index addd71bb72..c5ebbf6415 100644 --- a/core/src/main/java/io/bitsquare/payment/PaymentAccount.java +++ b/core/src/main/java/io/bitsquare/payment/PaymentAccount.java @@ -135,10 +135,6 @@ public abstract class PaymentAccount implements Persistable { return contractData.getPaymentDetails(); } - public int getMaxTradePeriod() { - return contractData.getMaxTradePeriod(); - } - public Date getCreationDate() { return creationDate; } diff --git a/core/src/main/java/io/bitsquare/payment/PaymentAccountContractData.java b/core/src/main/java/io/bitsquare/payment/PaymentAccountContractData.java index d8ea3036d6..a763440472 100644 --- a/core/src/main/java/io/bitsquare/payment/PaymentAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/PaymentAccountContractData.java @@ -26,14 +26,14 @@ public abstract class PaymentAccountContractData implements Payload { protected final String paymentMethodName; protected final String id; - protected final int maxTradePeriod; + protected final long maxTradePeriod; /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - PaymentAccountContractData(String paymentMethodName, String id, int maxTradePeriod) { + PaymentAccountContractData(String paymentMethodName, String id, long maxTradePeriod) { this.paymentMethodName = paymentMethodName; this.id = id; this.maxTradePeriod = maxTradePeriod; @@ -55,11 +55,10 @@ public abstract class PaymentAccountContractData implements Payload { abstract public String getPaymentDetailsForTradePopup(); - public int getMaxTradePeriod() { + public long getMaxTradePeriod() { return maxTradePeriod; } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -78,7 +77,7 @@ public abstract class PaymentAccountContractData implements Payload { public int hashCode() { int result = paymentMethodName != null ? paymentMethodName.hashCode() : 0; result = 31 * result + (id != null ? id.hashCode() : 0); - result = 31 * result + maxTradePeriod; + result = 31 * result + (int) (maxTradePeriod ^ (maxTradePeriod >>> 32)); return result; } diff --git a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java index e1cb8d55ce..70078600fa 100644 --- a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java @@ -25,7 +25,7 @@ public final class PerfectMoneyAccountContractData extends PaymentAccountContrac private String accountNr; - public PerfectMoneyAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public PerfectMoneyAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/SameBankAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SameBankAccountContractData.java index 6811ef0219..6c6619362e 100644 --- a/core/src/main/java/io/bitsquare/payment/SameBankAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SameBankAccountContractData.java @@ -28,7 +28,7 @@ public final class SameBankAccountContractData extends BankAccountContractData { private static final Logger log = LoggerFactory.getLogger(SameBankAccountContractData.class); - public SameBankAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public SameBankAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java index bf1487a177..89b795c41a 100644 --- a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java @@ -40,7 +40,7 @@ public final class SepaAccountContractData extends CountryBasedPaymentAccountCon // Dont use a set here as we need a deterministic ordering, otherwise the contract hash does not match private final ArrayList acceptedCountryCodes; - public SepaAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public SepaAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); Set acceptedCountryCodesAsSet = CountryUtil.getAllSepaCountries().stream().map(e -> e.code).collect(Collectors.toSet()); acceptedCountryCodes = new ArrayList<>(acceptedCountryCodesAsSet); diff --git a/core/src/main/java/io/bitsquare/payment/SpecificBanksAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SpecificBanksAccountContractData.java index cdddfc6e54..43ab10b740 100644 --- a/core/src/main/java/io/bitsquare/payment/SpecificBanksAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SpecificBanksAccountContractData.java @@ -36,7 +36,7 @@ public final class SpecificBanksAccountContractData extends BankAccountContractD // Dont use a set here as we need a deterministic ordering, otherwise the contract hash does not match private ArrayList acceptedBanks; - public SpecificBanksAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public SpecificBanksAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); acceptedBanks = new ArrayList<>(); } diff --git a/core/src/main/java/io/bitsquare/payment/SwishAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SwishAccountContractData.java index c9c196288b..79a52b7947 100644 --- a/core/src/main/java/io/bitsquare/payment/SwishAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SwishAccountContractData.java @@ -26,7 +26,7 @@ public final class SwishAccountContractData extends PaymentAccountContractData { private String mobileNr; private String holderName; - public SwishAccountContractData(String paymentMethod, String id, int maxTradePeriod) { + public SwishAccountContractData(String paymentMethod, String id, long maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java index a0eedc4fe7..5c16942c8e 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java @@ -108,7 +108,7 @@ public abstract class PaymentMethodForm { public static void addAllowedPeriod(GridPane gridPane, int gridRow, @Nullable PaymentAccountContractData paymentAccountContractData, String dateFromBlocks) { if (paymentAccountContractData != null) { - long hours = paymentAccountContractData.getMaxTradePeriod() / 6; + long hours = paymentAccountContractData.getMaxTradePeriod() / 3600; String displayText; if (hours == 1) displayText = hours + " hour";