From f2b977a01410db3b0be8a9fbd66e595c1d44e2e6 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 13 Apr 2016 17:48:37 +0200
Subject: [PATCH] Remove option for using BitcoinJ over Tor (Tor in BitcoinJ is
 considered experimental, will be supported later over our native Tor
 instance)

---
 .../java/io/bitsquare/user/Preferences.java   |  8 +++---
 .../settings/network/NetworkSettingsView.fxml | 26 +++++++++----------
 .../settings/network/NetworkSettingsView.java | 10 +++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java
index c840ce2936..9bdd2ac2cc 100644
--- a/core/src/main/java/io/bitsquare/user/Preferences.java
+++ b/core/src/main/java/io/bitsquare/user/Preferences.java
@@ -101,6 +101,7 @@ public final class Preferences implements Persistable {
     private boolean autoSelectArbitrators = true;
     private final Map<String, Boolean> dontShowAgainMap;
     private boolean tacAccepted;
+    // Don't remove as we don't want to break old serialized data
     private boolean useTorForBitcoinJ = false;
     private boolean showOwnOffersInOfferBook;
     private Locale preferredLocale;
@@ -158,7 +159,8 @@ public final class Preferences implements Persistable {
             defaultLocale = preferredLocale;
             preferredTradeCurrency = persisted.getPreferredTradeCurrency();
             defaultTradeCurrency = preferredTradeCurrency;
-            useTorForBitcoinJ = persisted.getUseTorForBitcoinJ();
+            // useTorForBitcoinJ = persisted.getUseTorForBitcoinJ();
+            useTorForBitcoinJ = false;
             useStickyMarketPrice = persisted.getUseStickyMarketPrice();
             showOwnOffersInOfferBook = persisted.getShowOwnOffersInOfferBook();
             maxPriceDistanceInPercent = persisted.getMaxPriceDistanceInPercent();
@@ -331,10 +333,10 @@ public final class Preferences implements Persistable {
         storage.queueUpForSave();
     }
 
-    public void setUseTorForBitcoinJ(boolean useTorForBitcoinJ) {
+   /* public void setUseTorForBitcoinJ(boolean useTorForBitcoinJ) {
         this.useTorForBitcoinJ = useTorForBitcoinJ;
         storage.queueUpForSave();
-    }
+    }*/
 
     public void setShowOwnOffersInOfferBook(boolean showOwnOffersInOfferBook) {
         this.showOwnOffersInOfferBook = showOwnOffersInOfferBook;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
index a8b14a085e..471daf9739 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
@@ -32,19 +32,19 @@
         <Insets bottom="10.0" left="25.0" top="30.0" right="25"/>
     </padding>
 
-    <TitledGroupBg text="Bitcoin network" GridPane.rowSpan="3"/>
+    <TitledGroupBg text="Bitcoin network" GridPane.rowSpan="2"/>
 
     <Label text="Select Network:" GridPane.rowIndex="0"/>
     <ComboBox fx:id="netWorkComboBox" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
 
-    <Label text="Use tor:" GridPane.rowIndex="1"/>
-    <CheckBox fx:id="useTorCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
-
-    <Label fx:id="bitcoinPeersLabel" text="Connected peers:" GridPane.rowIndex="2"/>
-    <TextArea fx:id="bitcoinPeersTextArea" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
+    <!-- <Label text="Use tor:" GridPane.rowIndex="1"/>
+     <CheckBox fx:id="useTorCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+ -->
+    <Label fx:id="bitcoinPeersLabel" text="Connected peers:" GridPane.rowIndex="1"/>
+    <TextArea fx:id="bitcoinPeersTextArea" GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
               GridPane.vgrow="SOMETIMES" editable="false" focusTraversable="false"/>
 
-    <TitledGroupBg text="P2P network" GridPane.rowIndex="3" GridPane.rowSpan="5">
+    <TitledGroupBg text="P2P network" GridPane.rowIndex="2" GridPane.rowSpan="5">
         <padding>
             <Insets top="50.0"/>
         </padding>
@@ -53,20 +53,20 @@
         </GridPane.margin>
     </TitledGroupBg>
 
-    <Label text="My onion address:" GridPane.rowIndex="3">
+    <Label text="My onion address:" GridPane.rowIndex="2">
         <GridPane.margin>
             <Insets top="50.0"/>
         </GridPane.margin>
     </Label>
-    <TextField fx:id="onionAddress" GridPane.rowIndex="3" GridPane.columnIndex="1"
+    <TextField fx:id="onionAddress" GridPane.rowIndex="2" GridPane.columnIndex="1"
                editable="false" focusTraversable="false">
         <GridPane.margin>
             <Insets top="50.0"/>
         </GridPane.margin>
     </TextField>
 
-    <Label fx:id="p2PPeersLabel" text="Connected peers:" GridPane.rowIndex="4"/>
-    <TableView fx:id="tableView" GridPane.rowIndex="4" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
+    <Label fx:id="p2PPeersLabel" text="Connected peers:" GridPane.rowIndex="3"/>
+    <TableView fx:id="tableView" GridPane.rowIndex="3" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
                GridPane.vgrow="ALWAYS">
         <columns>
             <TableColumn text="Onion address" fx:id="onionAddressColumn" minWidth="220">
@@ -112,8 +112,8 @@
         </columns>
     </TableView>
 
-    <Label text="Total traffic:" GridPane.rowIndex="5"/>
-    <TextField fx:id="totalTraffic" GridPane.rowIndex="5" GridPane.columnIndex="1" editable="false"
+    <Label text="Total traffic:" GridPane.rowIndex="4"/>
+    <TextField fx:id="totalTraffic" GridPane.rowIndex="4" GridPane.columnIndex="1" editable="false"
                focusTraversable="false"/>
 
     <columnConstraints>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index 52136c1fed..e978a99262 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -66,8 +66,8 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
     TextArea bitcoinPeersTextArea;
     @FXML
     Label bitcoinPeersLabel, p2PPeersLabel;
-    @FXML
-    CheckBox useTorCheckBox;
+    /* @FXML
+     CheckBox useTorCheckBox;*/
     @FXML
     TableView<P2pNetworkListItem> tableView;
     @FXML
@@ -130,7 +130,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
 
     @Override
     public void activate() {
-        useTorCheckBox.setSelected(preferences.getUseTorForBitcoinJ());
+      /*  useTorCheckBox.setSelected(preferences.getUseTorForBitcoinJ());
         useTorCheckBox.setOnAction(event -> {
             boolean selected = useTorCheckBox.isSelected();
             if (selected != preferences.getUseTorForBitcoinJ()) {
@@ -145,7 +145,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
                         .onClose(() -> useTorCheckBox.setSelected(!selected))
                         .show();
             }
-        });
+        });*/
         bitcoinPeersSubscription = EasyBind.subscribe(walletService.connectedPeersProperty(), connectedPeers -> updateBitcoinPeersTextArea());
 
         nodeAddressSubscription = EasyBind.subscribe(p2PService.getNetworkNode().nodeAddressProperty(),
@@ -160,7 +160,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
 
     @Override
     public void deactivate() {
-        useTorCheckBox.setOnAction(null);
+        //useTorCheckBox.setOnAction(null);
 
         if (nodeAddressSubscription != null)
             nodeAddressSubscription.unsubscribe();