Merge pull request thaliproject#124 from zeroleak/fix-hasSafeSocks-true

yaronyg · web-flow · commit f49f2d206b03 · 2019-07-03T09:34:33.000-07:00
SafeSocks cannot be enabled with TorSettings thaliproject#123
diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
@@ -375,7 +375,7 @@ public TorConfigBuilder safeSocksEnable() {
 
     @SettingsConfig
     public TorConfigBuilder safeSocksFromSettings() {
-        return !settings.hasSafeSocks() ? safeSocksDisable() : this;
+        return !settings.hasSafeSocks() ? safeSocksDisable() : safeSocksEnable();
     }
 
     public TorConfigBuilder setGeoIpFiles() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public TorConfigBuilder safeSocksEnable() {`
`375`	`375`
`376`	`376`	`@SettingsConfig`
`377`	`377`	`public TorConfigBuilder safeSocksFromSettings() {`
`378`		`- return !settings.hasSafeSocks() ? safeSocksDisable() : this;`
	`378`	`+ return !settings.hasSafeSocks() ? safeSocksDisable() : safeSocksEnable();`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`public TorConfigBuilder setGeoIpFiles() throws IOException {`