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

Merge pull request #94 from Unpublished/fix88 

remove some transproxy left overs
This commit is contained in:
Nathan Freitas 2017-11-01 12:22:32 -04:00 committed by GitHub
parent 1b904125f3 cbffc1d6ca
commit 71e3464358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,8 @@ android:key="pref_enable_logging"
android:defaultValue="false" android:defaultValue="false"
android:title="Debug Log" android:title="Debug Log"
android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_" android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
android:enabled="true"></CheckBoxPreference> android:enabled="true"
/>
@ -242,12 +243,5 @@ android:summary="@string/pref_disable_network_summary"
android:enabled="true" android:enabled="true"
android:title="@string/pref_disable_network_title"/> android:title="@string/pref_disable_network_title"/>
<Preference
android:key="pref_transproxy_flush"
android:summary="@string/pref_transproxy_flush_summary"
android:enabled="true"
android:title="@string/pref_transproxy_flush_title"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

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

@ -94,7 +94,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT; private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT;
private static final int NOTIFY_ID = 1; private static final int NOTIFY_ID = 1;
private static final int TRANSPROXY_NOTIFY_ID = 2;
private static final int ERROR_NOTIFY_ID = 3; private static final int ERROR_NOTIFY_ID = 3;
private static final int HS_NOTIFY_ID = 4; private static final int HS_NOTIFY_ID = 4;

2
orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
View File

@ -77,7 +77,7 @@ public class Prefs {
} }
public static void disableTransparentProxying() { public static void disableTransparentProxying() {
prefs.getBoolean(PREF_TRANSPARENT, false); putBoolean(PREF_TRANSPARENT, false);
} }
public static boolean transparentProxyAll() { public static boolean transparentProxyAll() {