sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

try proxy setting if internal tor cant start

Browse source
This commit is contained in:
Craig Raw 2021-03-15 14:07:48 +02:00
parent 7c6daf2e11
commit 8b7d1e6888
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
View file

@ -151,6 +151,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
private Boolean useSslOriginal; private Boolean useSslOriginal;
private Boolean useProxyOriginal;
@Override @Override
public void initializeView(Config config) { public void initializeView(Config config) {
EventManager.get().register(this); EventManager.get().register(this);
@ -424,6 +426,18 @@ public class ServerPreferencesController extends PreferencesDetailController {
torService.cancel(); torService.cancel();
testResults.appendText("\nTor failed to start"); testResults.appendText("\nTor failed to start");
showConnectionFailure(workerStateEvent.getSource().getException()); showConnectionFailure(workerStateEvent.getSource().getException());
Throwable exception = workerStateEvent.getSource().getException();
if(Config.get().getServerType() == ServerType.ELECTRUM_SERVER &&
exception.getCause() != null && exception.getCause() instanceof TorControlError && exception.getCause().getMessage().contains("Failed to bind") &&
useProxyOriginal == null && !useProxy.isSelected() && proxyHost.getText().isEmpty() && proxyPort.getText().isEmpty()) {
useProxy.setSelected(true);
proxyHost.setText("localhost");
proxyPort.setText("9050");
useProxyOriginal = false;
testResults.appendText("\n\nAssuming Tor proxy is running on port 9050 and trying again...");
startElectrumConnection();
}
}); });
torService.start(); torService.start();
@ -448,6 +462,7 @@ public class ServerPreferencesController extends PreferencesDetailController {
getMasterController().reconnectOnClosingProperty().set(true); getMasterController().reconnectOnClosingProperty().set(true);
Config.get().setMode(Mode.ONLINE); Config.get().setMode(Mode.ONLINE);
connectionService.cancel(); connectionService.cancel();
useProxyOriginal = null;
}); });
connectionService.setOnFailed(workerStateEvent -> { connectionService.setOnFailed(workerStateEvent -> {
EventManager.get().unregister(connectionService); EventManager.get().unregister(connectionService);
@ -475,6 +490,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
useSslOriginal = null; useSslOriginal = null;
} }
} }
if(useProxyOriginal != null && !useProxyOriginal) {
useProxy.setSelected(false);
proxyHost.setText("");
proxyPort.setText("");
useProxyOriginal = null;
}
}); });
connectionService.start(); connectionService.start();
} }