dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'isolateDest' of https://github.com/SpotComms/orbot into SpotComms-isolateDest

This commit is contained in:
n8fr8 2017-10-31 09:44:08 -04:00
parent 750a282e20 18dd53d419
commit 8bbf0ba799
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/values/strings.xml
View File

@ -380,7 +380,6 @@
<string name="enable">Enable</string> <string name="enable">Enable</string>
<string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string> <string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string>
<string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string> <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string>
<string name="pref_isolate_dest">Isolate destination addresses</string>
<string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string> <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string>
<string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string>
</resources> </resources>

9
app/src/main/res/xml/preferences.xml
View File

@ -157,6 +157,15 @@ android:dialogTitle="@string/enter_ports"
/> />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Isolation">
<CheckBoxPreference
android:key="pref_isolate_dest"
android:defaultValue="false"
android:title="@string/pref_isolate_dest"
android:summary="@string/pref_isolate_dest_summary"
android:enabled="true"></CheckBoxPreference>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_proxy_title"> <PreferenceCategory android:title="@string/pref_proxy_title">
<EditTextPreference android:key="pref_proxy_type" <EditTextPreference android:key="pref_proxy_type"
android:title="@string/pref_proxy_type_title" android:title="@string/pref_proxy_type_title"

4
orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
View File

@ -33,5 +33,7 @@ public interface OrbotConstants {
public final static int MAX_LOG_LENGTH = 10000; public final static int MAX_LOG_LENGTH = 10000;
public final static String PREF_SOCKS = "pref_socks"; public final static String PREF_SOCKS = "pref_socks";
public final static String PREF_ISOLATE_DEST = "pref_isolate_dest";
} }

8
orbotservice/src/main/java/org/torproject/android/service/TorService.java
View File

@ -661,8 +661,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
if (isPortUsed) //the specified port is not available, so let Tor find one instead if (isPortUsed) //the specified port is not available, so let Tor find one instead
socksPortPref = "auto"; socksPortPref = "auto";
} }
String isolate = " ";
if(prefs.getBoolean(OrbotConstants.PREF_ISOLATE_DEST, false))
{
isolate += "IsolateDestAddr";
}
extraLines.append("SOCKSPort ").append(socksPortPref).append('\n'); extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append('\n');
extraLines.append("SafeSocks 0").append('\n'); extraLines.append("SafeSocks 0").append('\n');
extraLines.append("TestSocks 0").append('\n'); extraLines.append("TestSocks 0").append('\n');
extraLines.append("WarnUnsafeSocks 1").append('\n'); extraLines.append("WarnUnsafeSocks 1").append('\n');