[tor-commits] [orbot/master] remove unsupported preferences

[n8fr8@xxxxxxxxxxxxxx]

commit a685bf148817546ee2f6cb69dfd75d1facb76a77
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Wed Oct 25 11:42:26 2017 -0400

    remove unsupported preferences
---
 .../android/settings/SettingsPreferences.java           |  9 ---------
 app/src/main/res/xml/preferences.xml                    | 17 ++---------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index 9078b100..74986779 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -28,7 +28,6 @@ public class SettingsPreferences
 		extends PreferenceActivity implements OnPreferenceClickListener {
     private static final String TAG = "SettingsPreferences";
 
-	private Preference prefTransProxyApps = null;
 	private ListPreference prefLocale = null;
 	
     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);
-        }
-        
         
     }
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c20dc4fa..995fbbee 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -35,7 +35,7 @@ android:title="@string/pref_allow_background_starts_title"/>
  </ListPreference>
 
 </PreferenceCategory>
-
+<!--
 <PreferenceCategory android:title="@string/pref_trans_proxy_group">
 
 <CheckBoxPreference 
@@ -75,7 +75,7 @@ android:title="@string/pref_transparent_tethering_title"/>
 
 
 </PreferenceCategory>
-
+-->
 <PreferenceCategory android:title="@string/pref_node_configuration"
  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>
 
 
-<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
 android:defaultValue="true" 
@@ -240,12 +233,6 @@ android:summary="@string/pref_disable_network_summary"
 android:enabled="true" 
 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
 android:key="pref_transproxy_flush"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits