Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-07 06:32:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove option for using BitcoinJ over Tor (Tor in BitcoinJ is considered experimental, will be supported later over our native Tor instance)

Browse source
This commit is contained in:
Manfred Karrer 2016-04-13 17:48:37 +02:00
parent 73612345ea
commit f2b977a014
3 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/io/bitsquare/user/Preferences.java
View file

@ -101,6 +101,7 @@ public final class Preferences implements Persistable {
private boolean autoSelectArbitrators = true; private boolean autoSelectArbitrators = true;
private final Map<String, Boolean> dontShowAgainMap; private final Map<String, Boolean> dontShowAgainMap;
private boolean tacAccepted; private boolean tacAccepted;
// Don't remove as we don't want to break old serialized data
private boolean useTorForBitcoinJ = false; private boolean useTorForBitcoinJ = false;
private boolean showOwnOffersInOfferBook; private boolean showOwnOffersInOfferBook;
private Locale preferredLocale; private Locale preferredLocale;
@ -158,7 +159,8 @@ public final class Preferences implements Persistable {
defaultLocale = preferredLocale; defaultLocale = preferredLocale;
preferredTradeCurrency = persisted.getPreferredTradeCurrency(); preferredTradeCurrency = persisted.getPreferredTradeCurrency();
defaultTradeCurrency = preferredTradeCurrency; defaultTradeCurrency = preferredTradeCurrency;
useTorForBitcoinJ = persisted.getUseTorForBitcoinJ(); // useTorForBitcoinJ = persisted.getUseTorForBitcoinJ();
useTorForBitcoinJ = false;
useStickyMarketPrice = persisted.getUseStickyMarketPrice(); useStickyMarketPrice = persisted.getUseStickyMarketPrice();
showOwnOffersInOfferBook = persisted.getShowOwnOffersInOfferBook(); showOwnOffersInOfferBook = persisted.getShowOwnOffersInOfferBook();
maxPriceDistanceInPercent = persisted.getMaxPriceDistanceInPercent(); maxPriceDistanceInPercent = persisted.getMaxPriceDistanceInPercent();
@ -331,10 +333,10 @@ public final class Preferences implements Persistable {
storage.queueUpForSave(); storage.queueUpForSave();
} }
public void setUseTorForBitcoinJ(boolean useTorForBitcoinJ) { /* public void setUseTorForBitcoinJ(boolean useTorForBitcoinJ) {
this.useTorForBitcoinJ = useTorForBitcoinJ; this.useTorForBitcoinJ = useTorForBitcoinJ;
storage.queueUpForSave(); storage.queueUpForSave();
} }*/
public void setShowOwnOffersInOfferBook(boolean showOwnOffersInOfferBook) { public void setShowOwnOffersInOfferBook(boolean showOwnOffersInOfferBook) {
this.showOwnOffersInOfferBook = showOwnOffersInOfferBook; this.showOwnOffersInOfferBook = showOwnOffersInOfferBook;

24
gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
View file

@ -32,19 +32,19 @@
<Insets bottom="10.0" left="25.0" top="30.0" right="25"/> <Insets bottom="10.0" left="25.0" top="30.0" right="25"/>
</padding> </padding>
<TitledGroupBg text="Bitcoin network" GridPane.rowSpan="3"/> <TitledGroupBg text="Bitcoin network" GridPane.rowSpan="2"/>
<Label text="Select Network:" GridPane.rowIndex="0"/> <Label text="Select Network:" GridPane.rowIndex="0"/>
<ComboBox fx:id="netWorkComboBox" GridPane.rowIndex="0" GridPane.columnIndex="1"/> <ComboBox fx:id="netWorkComboBox" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
<Label text="Use tor:" GridPane.rowIndex="1"/> <!-- <Label text="Use tor:" GridPane.rowIndex="1"/>
<CheckBox fx:id="useTorCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/> <CheckBox fx:id="useTorCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
-->
<Label fx:id="bitcoinPeersLabel" text="Connected peers:" GridPane.rowIndex="2"/> <Label fx:id="bitcoinPeersLabel" text="Connected peers:" GridPane.rowIndex="1"/>
<TextArea fx:id="bitcoinPeersTextArea" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" <TextArea fx:id="bitcoinPeersTextArea" GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
GridPane.vgrow="SOMETIMES" editable="false" focusTraversable="false"/> 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> <padding>
<Insets top="50.0"/> <Insets top="50.0"/>
</padding> </padding>
@ -53,20 +53,20 @@
</GridPane.margin> </GridPane.margin>
</TitledGroupBg> </TitledGroupBg>
<Label text="My onion address:" GridPane.rowIndex="3"> <Label text="My onion address:" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
<Insets top="50.0"/> <Insets top="50.0"/>
</GridPane.margin> </GridPane.margin>
</Label> </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"> editable="false" focusTraversable="false">
<GridPane.margin> <GridPane.margin>
<Insets top="50.0"/> <Insets top="50.0"/>
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<Label fx:id="p2PPeersLabel" text="Connected peers:" GridPane.rowIndex="4"/> <Label fx:id="p2PPeersLabel" text="Connected peers:" GridPane.rowIndex="3"/>
<TableView fx:id="tableView" GridPane.rowIndex="4" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" <TableView fx:id="tableView" GridPane.rowIndex="3" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"
GridPane.vgrow="ALWAYS"> GridPane.vgrow="ALWAYS">
<columns> <columns>
<TableColumn text="Onion address" fx:id="onionAddressColumn" minWidth="220"> <TableColumn text="Onion address" fx:id="onionAddressColumn" minWidth="220">
@ -112,8 +112,8 @@
</columns> </columns>
</TableView> </TableView>
<Label text="Total traffic:" GridPane.rowIndex="5"/> <Label text="Total traffic:" GridPane.rowIndex="4"/>
<TextField fx:id="totalTraffic" GridPane.rowIndex="5" GridPane.columnIndex="1" editable="false" <TextField fx:id="totalTraffic" GridPane.rowIndex="4" GridPane.columnIndex="1" editable="false"
focusTraversable="false"/> focusTraversable="false"/>
<columnConstraints> <columnConstraints>

10
gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
View file

@ -66,8 +66,8 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
TextArea bitcoinPeersTextArea; TextArea bitcoinPeersTextArea;
@FXML @FXML
Label bitcoinPeersLabel, p2PPeersLabel; Label bitcoinPeersLabel, p2PPeersLabel;
@FXML /* @FXML
CheckBox useTorCheckBox; CheckBox useTorCheckBox;*/
@FXML @FXML
TableView<P2pNetworkListItem> tableView; TableView<P2pNetworkListItem> tableView;
@FXML @FXML
@ -130,7 +130,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
@Override @Override
public void activate() { public void activate() {
useTorCheckBox.setSelected(preferences.getUseTorForBitcoinJ()); /* useTorCheckBox.setSelected(preferences.getUseTorForBitcoinJ());
useTorCheckBox.setOnAction(event -> { useTorCheckBox.setOnAction(event -> {
boolean selected = useTorCheckBox.isSelected(); boolean selected = useTorCheckBox.isSelected();
if (selected != preferences.getUseTorForBitcoinJ()) { if (selected != preferences.getUseTorForBitcoinJ()) {
@ -145,7 +145,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
.onClose(() -> useTorCheckBox.setSelected(!selected)) .onClose(() -> useTorCheckBox.setSelected(!selected))
.show(); .show();
} }
}); });*/
bitcoinPeersSubscription = EasyBind.subscribe(walletService.connectedPeersProperty(), connectedPeers -> updateBitcoinPeersTextArea()); bitcoinPeersSubscription = EasyBind.subscribe(walletService.connectedPeersProperty(), connectedPeers -> updateBitcoinPeersTextArea());
nodeAddressSubscription = EasyBind.subscribe(p2PService.getNetworkNode().nodeAddressProperty(), nodeAddressSubscription = EasyBind.subscribe(p2PService.getNetworkNode().nodeAddressProperty(),
@ -160,7 +160,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
@Override @Override
public void deactivate() { public void deactivate() {
useTorCheckBox.setOnAction(null); //useTorCheckBox.setOnAction(null);
if (nodeAddressSubscription != null) if (nodeAddressSubscription != null)
nodeAddressSubscription.unsubscribe(); nodeAddressSubscription.unsubscribe();