Merge pull request #2707 from ManfredKarrer/fix-filter

Use full address instead of hostname
bisq-network · Apr 13, 2019 · 994da7f · 994da7f
2 parents 8a3f42c + bb71fb1
commit 994da7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
@@ -538,7 +538,7 @@ private void applyFilterPredicate() {
 
     boolean isIgnored(Offer offer) {
         return preferences.getIgnoreTradersList().stream()
-                .anyMatch(i -> i.equals(offer.getMakerNodeAddress().getHostNameWithoutPostFix()));
+                .anyMatch(i -> i.equals(offer.getMakerNodeAddress().getFullAddress()));
     }
 
     boolean isOfferBanned(Offer offer) {

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
@@ -203,10 +203,7 @@ private void addContent() {
             }
 
             if (!nodesInputTextField.getText().isEmpty()) {
-                nodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(nodesInputTextField.getText())
-                        .replace(":9999", "")
-                        .replace(".onion", "")
-                        .split(",")));
+                nodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(nodesInputTextField.getText()).split(",")));
             }
 
             if (!paymentAccountFilterInputTextField.getText().isEmpty()) {
@@ -234,24 +231,15 @@ private void addContent() {
             }
 
             if (!arbitratorsInputTextField.getText().isEmpty()) {
-                arbitrators = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(arbitratorsInputTextField.getText())
-                        .replace(":9999", "")
-                        .replace(".onion", "")
-                        .split(",")));
+                arbitrators = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(arbitratorsInputTextField.getText()).split(",")));
             }
 
             if (!seedNodesInputTextField.getText().isEmpty()) {
-                seedNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(seedNodesInputTextField.getText())
-                        .replace(":9999", "")
-                        .replace(".onion", "")
-                        .split(",")));
+                seedNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(seedNodesInputTextField.getText()).split(",")));
             }
 
             if (!priceRelayNodesInputTextField.getText().isEmpty()) {
-                priceRelayNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(priceRelayNodesInputTextField.getText())
-                        .replace(":9999", "")
-                        .replace(".onion", "")
-                        .split(",")));
+                priceRelayNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(priceRelayNodesInputTextField.getText()).split(",")));
             }
 
             if (!btcNodesInputTextField.getText().isEmpty()) {

diff --git a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java b/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
@@ -324,9 +324,7 @@ public BaseCurrencyNetwork fromString(String string) {
         ignoreTradersListInputTextField = addInputTextField(root, ++gridRow,
                 Res.get("setting.preferences.ignorePeers"));
         ignoreTradersListListener = (observable, oldValue, newValue) ->
-                preferences.setIgnoreTradersList(Arrays.asList(StringUtils.deleteWhitespace(newValue)
-                        .replace(":9999", "").replace(".onion", "")
-                        .split(",")));
+                preferences.setIgnoreTradersList(Arrays.asList(StringUtils.deleteWhitespace(newValue).split(",")));
 
         // referralId
         referralIdInputTextField = addInputTextField(root, ++gridRow, Res.get("setting.preferences.refererId"));