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

Merge pull request #97 from SpotComms/padding 

Expose *ConnectionPadding
This commit is contained in:
Nathan Freitas 2017-11-11 08:53:21 -05:00 committed by GitHub
parent 8cf412ad62 6e4b700803
commit 72c7e0445c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,4 +384,8 @@
<string name="pref_isolate_dest_summary">Use a different circuit for each destination address</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_connection_padding">Connection padding</string>
<string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string>
<string name="pref_reduced_connection_padding">Reduced connection padding</string>
<string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string>
</resources>

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

@ -166,6 +166,22 @@ android:summary="@string/pref_isolate_dest_summary"
android:enabled="true"></CheckBoxPreference>
</PreferenceCategory>
<PreferenceCategory android:title="ConnectionPadding">
<CheckBoxPreference
android:key="pref_connection_padding"
android:defaultValue="false"
android:title="@string/pref_connection_padding"
android:summary="@string/pref_connection_padding_summary"
android:enabled="true"></CheckBoxPreference>
<CheckBoxPreference
android:key="pref_reduced_connection_padding"
android:defaultValue="true"
android:title="@string/pref_reduced_connection_padding"
android:summary="@string/pref_reduced_connection_padding_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"

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

@ -36,4 +36,7 @@ public interface OrbotConstants {
public final static String PREF_ISOLATE_DEST = "pref_isolate_dest";
public final static String PREF_CONNECTION_PADDING = "pref_connection_padding";
public final static String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding";
}

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

@ -672,6 +672,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
extraLines.append("TestSocks 0").append('\n');
extraLines.append("WarnUnsafeSocks 1").append('\n');
if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false))
{
extraLines.append("ConnectionPadding 1").append('\n');
}
if(prefs.getBoolean(OrbotConstants.PREF_REDUCED_CONNECTION_PADDING, true))
{
extraLines.append("ReducedConnectionPadding 1").append('\n');
}
String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+"");
String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");