Remove I2P from config

bisq-network · Jul 23, 2022 · 49fa990 · 49fa990
1 parent ecc055c
commit 49fa990
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/application/src/main/resources/default.conf b/application/src/main/resources/default.conf
@@ -47,7 +47,7 @@ application {
     }
 
     network = {
-         supportedTransportTypes = ["CLEAR", "TOR", "I2P"]
+        supportedTransportTypes = ["CLEAR", "TOR"]
 
         serviceNode {
             p2pServiceNode="PEER_GROUP,DATA,CONFIDENTIAL,MONITOR"

diff --git a/application/src/main/resources/network.conf b/application/src/main/resources/network.conf
@@ -17,7 +17,7 @@ application {
     }
 
     network = {
-        supportedTransportTypes = ["CLEAR", "TOR", "I2P"]
+        supportedTransportTypes = ["CLEAR", "TOR"]
 
         serviceNode {
             p2pServiceNode="PEER_GROUP,DATA,CONFIDENTIAL,MONITOR"

diff --git a/...op/src/main/java/bisq/desktop/primary/overlay/onboarding/profile/GenerateProfileView.java b/...op/src/main/java/bisq/desktop/primary/overlay/onboarding/profile/GenerateProfileView.java
@@ -45,6 +45,7 @@ public class GenerateProfileView extends View<VBox, GenerateProfileModel, Genera
     protected final ProgressIndicator powProgressIndicator;
     protected final MaterialTextField nickname;
     protected final ProgressIndicator createProfileIndicator;
+    private final Label busyInfo;
 
     public GenerateProfileView(GenerateProfileModel model, GenerateProfileController controller) {
         super(new VBox(), model, controller);
@@ -118,7 +119,11 @@ public GenerateProfileView(GenerateProfileModel model, GenerateProfileController
         createProfileIndicator.setManaged(false);
         createProfileIndicator.setVisible(false);
 
-        HBox buttons = new HBox(20, regenerateButton, createProfileButton, createProfileIndicator);
+        busyInfo = new Label(Res.get("generateNym.createProfile.busy"));
+        busyInfo.setManaged(false);
+        busyInfo.setVisible(false);
+
+        HBox buttons = new HBox(20, regenerateButton, createProfileButton, createProfileIndicator, busyInfo);
         buttons.setAlignment(Pos.CENTER);
 
         VBox.setMargin(headLineLabel, new Insets(40, 0, 0, 0));
@@ -155,6 +160,9 @@ protected void onViewAttached() {
         createProfileIndicator.visibleProperty().bind(model.getCreateProfileProgress().lessThan(0));
         createProfileIndicator.progressProperty().bind(model.getCreateProfileProgress());
 
+        busyInfo.managedProperty().bind(model.getCreateProfileProgress().lessThan(0));
+        busyInfo.visibleProperty().bind(model.getCreateProfileProgress().lessThan(0));
+
         regenerateButton.setOnMouseClicked(e -> controller.onRegenerate());
         roboIconView.setOnMouseClicked(e -> controller.onRegenerate());
         createProfileButton.setOnMouseClicked(e -> {
@@ -175,6 +183,8 @@ protected void onViewDetached() {
         powProgressIndicator.managedProperty().unbind();
         powProgressIndicator.visibleProperty().unbind();
         powProgressIndicator.progressProperty().unbind();
+        busyInfo.managedProperty().unbind();
+        busyInfo.visibleProperty().unbind();
 
         nym.textProperty().unbind();
         nym.disableProperty().unbind();

diff --git a/i18n/src/main/resources/default.properties b/i18n/src/main/resources/default.properties
@@ -470,6 +470,7 @@ generateNym.nym=This bot's name is:
 generateNym.regenerate=Generate new bot icon
 generateNym.nym.generating=Doing proof of work...
 generateNym.createProfile=Finish
+generateNym.createProfile.busy=Initializing network node...
 # Add nickname
 addNickName.headline=Add nickname to profile
 addNickName.subTitle=Choose a nickname for your chat profile.\n\

diff --git a/network/src/main/java/bisq/network/p2p/node/transport/TorTransport.java b/network/src/main/java/bisq/network/p2p/node/transport/TorTransport.java
@@ -49,7 +49,6 @@ public Config(String baseDir, int socketTimeout) {
 
     public TorTransport(Transport.Config config) {
         torDirPath = config.getBaseDir() + separator + "tor";
-        log.info("TorTransport using torDirPath: {}", torDirPath);
         // We get a singleton instance per application (torDirPath)
         tor = Tor.getTor(torDirPath);
     }

diff --git a/tor/src/main/java/bisq/tor/Tor.java b/tor/src/main/java/bisq/tor/Tor.java
@@ -94,6 +94,7 @@ public static Tor getTor(String torDirPath) {
             if (TOR_BY_APP.containsKey(torDirPath)) {
                 tor = TOR_BY_APP.get(torDirPath);
             } else {
+                log.info("Creating Tor using torDirPath: {}", torDirPath);
                 tor = new Tor(torDirPath);
                 TOR_BY_APP.put(torDirPath, tor);
             }