From f39811714793dc47d0d957032f3d436032bd3b50 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 9 Dec 2019 15:35:15 +0100 Subject: [PATCH 1/2] Remove unnecessary indirection for setting custom withdrawal fees --- .../main/java/bisq/core/user/Preferences.java | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java index a8933201f2f..ea7f4cfd83f 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/bisq/core/user/Preferences.java @@ -47,10 +47,8 @@ import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; -import javafx.beans.property.LongProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.property.SimpleLongProperty; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; @@ -126,10 +124,6 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid private final BooleanProperty useAnimationsProperty = new SimpleBooleanProperty(prefPayload.isUseAnimations()); @Getter private final IntegerProperty cssThemeProperty = new SimpleIntegerProperty(prefPayload.getCssTheme()); - @Getter - private final BooleanProperty useCustomWithdrawalTxFeeProperty = new SimpleBooleanProperty(prefPayload.isUseCustomWithdrawalTxFee()); - @Getter - private final LongProperty withdrawalTxFeeInBytesProperty = new SimpleLongProperty(prefPayload.getWithdrawalTxFeeInBytes()); private final ObservableList fiatCurrenciesAsObservable = FXCollections.observableArrayList(); private final ObservableList cryptoCurrenciesAsObservable = FXCollections.observableArrayList(); @@ -202,16 +196,6 @@ public Preferences(Storage storage, persist(); }); - useCustomWithdrawalTxFeeProperty.addListener((ov) -> { - prefPayload.setUseCustomWithdrawalTxFee(useCustomWithdrawalTxFeeProperty.get()); - persist(); - }); - - withdrawalTxFeeInBytesProperty.addListener((ov) -> { - prefPayload.setWithdrawalTxFeeInBytes(withdrawalTxFeeInBytesProperty.get()); - persist(); - }); - fiatCurrenciesAsObservable.addListener(this::updateTradeCurrencies); cryptoCurrenciesAsObservable.addListener(this::updateTradeCurrencies); } @@ -270,8 +254,6 @@ public void readPersisted() { // set all properties useAnimationsProperty.set(prefPayload.isUseAnimations()); useStandbyModeProperty.set(prefPayload.isUseStandbyMode()); - useCustomWithdrawalTxFeeProperty.set(prefPayload.isUseCustomWithdrawalTxFee()); - withdrawalTxFeeInBytesProperty.set(prefPayload.getWithdrawalTxFeeInBytes()); tradeCurrenciesAsObservable.addAll(prefPayload.getFiatCurrencies()); tradeCurrenciesAsObservable.addAll(prefPayload.getCryptoCurrencies()); @@ -508,11 +490,13 @@ public void setBitcoinNodes(String bitcoinNodes) { } public void setUseCustomWithdrawalTxFee(boolean useCustomWithdrawalTxFee) { - useCustomWithdrawalTxFeeProperty.set(useCustomWithdrawalTxFee); + prefPayload.setUseCustomWithdrawalTxFee(useCustomWithdrawalTxFee); + persist(); } public void setWithdrawalTxFeeInBytes(long withdrawalTxFeeInBytes) { - withdrawalTxFeeInBytesProperty.set(withdrawalTxFeeInBytes); + prefPayload.setWithdrawalTxFeeInBytes(withdrawalTxFeeInBytes); + persist(); } public void setBuyerSecurityDepositAsPercent(double buyerSecurityDepositAsPercent, PaymentAccount paymentAccount) { @@ -751,15 +735,6 @@ public boolean getUseTorForBitcoinJ() { return prefPayload.isUseTorForBitcoinJ(); } - - public BooleanProperty useCustomWithdrawalTxFeeProperty() { - return useCustomWithdrawalTxFeeProperty; - } - - public LongProperty withdrawalTxFeeInBytesProperty() { - return withdrawalTxFeeInBytesProperty; - } - public double getBuyerSecurityDepositAsPercent(PaymentAccount paymentAccount) { double value = PaymentAccountUtil.isCryptoCurrencyAccount(paymentAccount) ? prefPayload.getBuyerSecurityDepositAsPercentForCrypto() : prefPayload.getBuyerSecurityDepositAsPercent(); From b2c006d4a399fcad7beb89ec5fdbfcfa5e5fc22d Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 9 Dec 2019 15:44:52 +0100 Subject: [PATCH 2/2] Update css theme property when read from data store --- core/src/main/java/bisq/core/user/Preferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java index ea7f4cfd83f..ae89c58a84f 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/bisq/core/user/Preferences.java @@ -254,6 +254,7 @@ public void readPersisted() { // set all properties useAnimationsProperty.set(prefPayload.isUseAnimations()); useStandbyModeProperty.set(prefPayload.isUseStandbyMode()); + cssThemeProperty.set(prefPayload.getCssTheme()); tradeCurrenciesAsObservable.addAll(prefPayload.getFiatCurrencies()); tradeCurrenciesAsObservable.addAll(prefPayload.getCryptoCurrencies());