diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index 131a84f02b..4d93a6f5a2 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -102,6 +102,7 @@ public final class Preferences implements Persistable { private final Map dontShowAgainMap; private boolean tacAccepted; private boolean useTorForBitcoinJ = true; + private boolean showOwnOffersInOfferBook; private Locale preferredLocale; private TradeCurrency preferredTradeCurrency; private long txFeePerKB = FeePolicy.getFeePerKb().value; @@ -153,6 +154,7 @@ public final class Preferences implements Persistable { preferredTradeCurrency = persisted.getPreferredTradeCurrency(); defaultTradeCurrency = preferredTradeCurrency; useTorForBitcoinJ = persisted.getUseTorForBitcoinJ(); + showOwnOffersInOfferBook = persisted.getShowOwnOffersInOfferBook(); try { setTxFeePerKB(persisted.getTxFeePerKB()); @@ -449,4 +451,12 @@ public final class Preferences implements Persistable { public boolean getUseTorForBitcoinJ() { return useTorForBitcoinJ; } + + public boolean getShowOwnOffersInOfferBook() { + return showOwnOffersInOfferBook; + } + + public void setShowOwnOffersInOfferBook(boolean showOwnOffersInOfferBook) { + this.showOwnOffersInOfferBook = showOwnOffersInOfferBook; + } } diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java index a18c833b8e..e04bade28d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java @@ -409,7 +409,8 @@ class OfferBookViewModel extends ActivatableViewModel { offer.getCurrencyCode().equals(selectedTradeCurrency.getCode()); boolean paymentMethodResult = showAllPaymentMethods || offer.getPaymentMethod().equals(selectedPaymentMethod); - return directionResult && currencyResult && paymentMethodResult; + boolean notMyOfferOrShowMyOffersActivated = !isMyOffer(offerBookListItem.getOffer()) || preferences.getShowOwnOffersInOfferBook(); + return directionResult && currencyResult && paymentMethodResult && notMyOfferOrShowMyOffersActivated; }); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java index 85037a0a8f..fed4b0c891 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java @@ -56,7 +56,7 @@ public class PreferencesView extends ActivatableViewAndModel userLanguageComboBox; private ComboBox preferredTradeCurrencyComboBox; - private CheckBox useAnimationsCheckBox, autoSelectArbitratorsCheckBox; + private CheckBox useAnimationsCheckBox, autoSelectArbitratorsCheckBox, showOwnOffersInOfferBook; private int gridRow = 0; //private InputTextField transactionFeeInputTextField; private ChangeListener transactionFeeFocusedListener; @@ -295,9 +295,11 @@ public class PreferencesView extends ActivatableViewAndModel preferences.setShowOwnOffersInOfferBook(showOwnOffersInOfferBook.isSelected())); + useAnimationsCheckBox.setSelected(preferences.getUseAnimations()); useAnimationsCheckBox.setOnAction(e -> preferences.setUseAnimations(useAnimationsCheckBox.isSelected())); @@ -424,6 +429,7 @@ public class PreferencesView extends ActivatableViewAndModel