Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ANON-Public
orbot
Commits
8bbf0ba7
Commit
8bbf0ba7
authored
Oct 31, 2017
by
n8fr8
Browse files
Merge branch 'isolateDest' of
https://github.com/SpotComms/orbot
into SpotComms-isolateDest
parents
750a282e
18dd53d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/src/main/res/values/strings.xml
View file @
8bbf0ba7
...
...
@@ -380,7 +380,6 @@
<string
name=
"enable"
>
Enable
</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=
"no_transproxy_warning_short"
>
WARNING: Transproxying no longer supported
</string>
<string
name=
"no_transproxy_warning"
>
WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.
</string>
<string
name=
"pref_isolate_dest"
>
Isolate destination addresses
</string>
<string
name=
"pref_isolate_dest_summary"
>
Use a different circuit for each destination address
</string>
</resources>
app/src/main/res/xml/preferences.xml
View file @
8bbf0ba7
...
...
@@ -157,6 +157,15 @@ android:dialogTitle="@string/enter_ports"
/>
</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"
>
<EditTextPreference
android:key=
"pref_proxy_type"
android:title=
"@string/pref_proxy_type_title"
...
...
orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
View file @
8bbf0ba7
...
...
@@ -33,5 +33,7 @@ public interface OrbotConstants {
public
final
static
int
MAX_LOG_LENGTH
=
10000
;
public
final
static
String
PREF_SOCKS
=
"pref_socks"
;
public
final
static
String
PREF_ISOLATE_DEST
=
"pref_isolate_dest"
;
}
orbotservice/src/main/java/org/torproject/android/service/TorService.java
View file @
8bbf0ba7
...
...
@@ -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
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
(
"TestSocks 0"
).
append
(
'\n'
);
extraLines
.
append
(
"WarnUnsafeSocks 1"
).
append
(
'\n'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment