commit ecdff5ce5cd7c40cec04f6a8ed60c0a8b6aae705 Author: n8fr8 nathan@guardianproject.info Date: Fri Jun 14 23:07:39 2019 -0400

remove unused settings for root and transproxy --- .../org/torproject/android/OrbotMainActivity.java | 6 ---- .../org/torproject/android/service/util/Prefs.java | 34 ---------------------- 2 files changed, 40 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index a87da30d..59a6d89b 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1065,12 +1065,6 @@ public class OrbotMainActivity extends AppCompatActivity else updateStatus(null, torStatus);

- if (Prefs.useTransparentProxying()) - { - showAlert(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning),true); - Prefs.disableTransparentProxying(); - } - addAppShortcuts();

//now you can handle the intents properly diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 0a2bf45e..7b5f132b 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -13,16 +13,10 @@ public class Prefs { private final static String PREF_DEFAULT_LOCALE = "pref_default_locale"; private final static String PREF_ENABLE_LOGGING = "pref_enable_logging"; private final static String PREF_EXPANDED_NOTIFICATIONS = "pref_expanded_notifications"; - private final static String PREF_HAS_ROOT = "has_root"; private final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications"; private final static String PREF_START_ON_BOOT = "pref_start_boot"; private final static String PREF_ALLOW_BACKGROUND_STARTS = "pref_allow_background_starts"; private final static String PREF_OPEN_PROXY_ON_ALL_INTERFACES = "pref_open_proxy_on_all_interfaces"; - private final static String PREF_TRANSPARENT = "pref_transparent"; - private final static String PREF_TRANSPARENT_ALL = "pref_transparent_all"; - private final static String PREF_TRANSPARENT_TETHERING = "pref_transparent_tethering"; - private final static String PREF_TRANSPROXY_REFRESH = "pref_transproxy_refresh"; - private final static String PREF_USE_SYSTEM_IPTABLES = "pref_use_sys_iptables"; private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes";

@@ -70,34 +64,6 @@ public class Prefs { putString(PREF_DEFAULT_LOCALE, value); }

- public static boolean useSystemIpTables() { - return prefs.getBoolean(PREF_USE_SYSTEM_IPTABLES, false); - } - - public static boolean useRoot() { - return prefs.getBoolean(PREF_HAS_ROOT, false); - } - - public static boolean useTransparentProxying() { - return prefs.getBoolean(PREF_TRANSPARENT, false); - } - - public static void disableTransparentProxying() { - putBoolean(PREF_TRANSPARENT, false); - } - - public static boolean transparentProxyAll() { - return prefs.getBoolean(PREF_TRANSPARENT_ALL, false); - } - - public static boolean transparentTethering() { - return prefs.getBoolean(PREF_TRANSPARENT_TETHERING, false); - } - - public static boolean transProxyNetworkRefresh() { - return prefs.getBoolean(PREF_TRANSPROXY_REFRESH, false); - } - public static boolean expandedNotifications() { return prefs.getBoolean(PREF_EXPANDED_NOTIFICATIONS, true); }