Extract code for removing retired nodes to a methods so its easier to…

… spot Signed-off-by: HenrikJannsen <[email protected]>
HenrikJannsen · Jul 29, 2024 · 2749e7d · 2749e7d
1 parent e2cc3c8
commit 2749e7d
Showing 1 changed file with 30 additions and 26 deletions.
diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
@@ -316,25 +316,7 @@ private void setupPreferences() {
         useStandbyModeProperty.set(prefPayload.isUseStandbyMode());
         cssThemeProperty.set(prefPayload.getCssTheme());
 
-        // a list of previously-used federated explorers
-        // if user preference references any deprecated explorers we need to select a new valid explorer
-        String deprecatedExplorers = "(bsq.bisq.cc|bsq.vante.me|bsq.emzy.de|bsq.sqrrm.net|bsq.bisq.services|bsq.ninja|bisq.mempool.emzy.de).*";
-
-        // if no valid Bitcoin block explorer is set, select the 1st valid Bitcoin block explorer
-        ArrayList<BlockChainExplorer> btcExplorers = getBlockChainExplorers();
-        if (getBlockChainExplorer() == null ||
-                getBlockChainExplorer().name.length() == 0 ||
-                getBlockChainExplorer().name.matches(deprecatedExplorers)) {
-            setBlockChainExplorer(btcExplorers.get(0));
-        }
-
-        // if no valid BSQ block explorer is set, randomly select a valid BSQ block explorer
-        ArrayList<BlockChainExplorer> bsqExplorers = getBsqBlockChainExplorers();
-        if (getBsqBlockChainExplorer() == null ||
-                getBsqBlockChainExplorer().name.length() == 0 ||
-                getBsqBlockChainExplorer().name.matches(deprecatedExplorers)) {
-            setBsqBlockChainExplorer(bsqExplorers.get((new Random()).nextInt(bsqExplorers.size())));
-        }
+        clearRetiredNodes();
 
         tradeCurrenciesAsObservable.addAll(prefPayload.getFiatCurrencies());
         tradeCurrenciesAsObservable.addAll(prefPayload.getCryptoCurrencies());
@@ -372,6 +354,35 @@ private void setupPreferences() {
             setUsePriceNotifications(true);
         }
 
+        // We set the capability in CoreNetworkCapabilities if the program argument is set.
+        // If we have set it in the preferences view we handle it here.
+        CoreNetworkCapabilities.maybeApplyDaoFullMode(config);
+
+        initialReadDone = true;
+        requestPersistence();
+    }
+
+    private void clearRetiredNodes() {
+        // a list of previously-used federated explorers
+        // if user preference references any deprecated explorers we need to select a new valid explorer
+        String deprecatedExplorers = "(bsq.bisq.cc|bsq.vante.me|bsq.emzy.de|bsq.sqrrm.net|bsq.bisq.services|bsq.ninja|bisq.mempool.emzy.de).*";
+
+        // if no valid Bitcoin block explorer is set, select the 1st valid Bitcoin block explorer
+        ArrayList<BlockChainExplorer> btcExplorers = getBlockChainExplorers();
+        if (getBlockChainExplorer() == null ||
+                getBlockChainExplorer().name.length() == 0 ||
+                getBlockChainExplorer().name.matches(deprecatedExplorers)) {
+            setBlockChainExplorer(btcExplorers.get(0));
+        }
+
+        // if no valid BSQ block explorer is set, randomly select a valid BSQ block explorer
+        ArrayList<BlockChainExplorer> bsqExplorers = getBsqBlockChainExplorers();
+        if (getBsqBlockChainExplorer() == null ||
+                getBsqBlockChainExplorer().name.length() == 0 ||
+                getBsqBlockChainExplorer().name.matches(deprecatedExplorers)) {
+            setBsqBlockChainExplorer(bsqExplorers.get((new Random()).nextInt(bsqExplorers.size())));
+        }
+
         // Remove retired XMR AutoConfirm address
         var doApplyDefaults = prefPayload.getAutoConfirmSettingsList().stream()
                 .map(autoConfirmSettings -> autoConfirmSettings.getServiceAddresses().stream()
@@ -387,13 +398,6 @@ private void setupPreferences() {
                     });
             persistenceManager.forcePersistNow();
         }
-
-        // We set the capability in CoreNetworkCapabilities if the program argument is set.
-        // If we have set it in the preferences view we handle it here.
-        CoreNetworkCapabilities.maybeApplyDaoFullMode(config);
-
-        initialReadDone = true;
-        requestPersistence();
     }