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

remove unsupported preferences

This commit is contained in:
n8fr8 2017-10-25 11:42:26 -04:00
parent 091037427a
commit a685bf1488
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
View File

@ -28,7 +28,6 @@ public class SettingsPreferences
extends PreferenceActivity implements OnPreferenceClickListener { extends PreferenceActivity implements OnPreferenceClickListener {
private static final String TAG = "SettingsPreferences"; private static final String TAG = "SettingsPreferences";
private Preference prefTransProxyApps = null;
private ListPreference prefLocale = null; private ListPreference prefLocale = null;
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -65,14 +64,6 @@ public class SettingsPreferences
}); });
prefTransProxyApps = findPreference("pref_transparent_app_list");
prefTransProxyApps.setOnPreferenceClickListener(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
prefTransProxyApps.setEnabled(true);
}
} }

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

@ -35,7 +35,7 @@ android:title="@string/pref_allow_background_starts_title"/>
</ListPreference> </ListPreference>
</PreferenceCategory> </PreferenceCategory>
<!--
<PreferenceCategory android:title="@string/pref_trans_proxy_group"> <PreferenceCategory android:title="@string/pref_trans_proxy_group">
<CheckBoxPreference <CheckBoxPreference
@ -75,7 +75,7 @@ android:title="@string/pref_transparent_tethering_title"/>
</PreferenceCategory> </PreferenceCategory>
-->
<PreferenceCategory android:title="@string/pref_node_configuration" <PreferenceCategory android:title="@string/pref_node_configuration"
android:summary="@string/pref_node_configuration_summary"> android:summary="@string/pref_node_configuration_summary">
@ -225,13 +225,6 @@ android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_v
android:enabled="true"></CheckBoxPreference> android:enabled="true"></CheckBoxPreference>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_use_sys_iptables"
android:summary="@string/pref_use_sys_iptables_summary"
android:enabled="true"
android:title="@string/pref_use_sys_iptables_title"/>
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
@ -240,12 +233,6 @@ 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"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_transproxy_refresh"
android:summary="@string/pref_transproxy_refresh_summary"
android:enabled="true"
android:title="@string/pref_transproxy_refresh_title"/>
<Preference <Preference
android:key="pref_transproxy_flush" android:key="pref_transproxy_flush"