[tor-commits] [orbot/master] remove some transproxy left overs

[n8fr8 at torproject.org]

commit cbffc1d6cad9074095a9609646657e2948ceb566
Author: Unpublished <unpublished at gmx.net>
Date:   Tue Oct 31 22:22:52 2017 +0100

    remove some transproxy left overs
    
    - fix typo to actually show transproxy warning only once (fixes issue #88)
---
 app/src/main/res/xml/preferences.xml                       | 14 ++++----------
 .../java/org/torproject/android/service/TorService.java    |  1 -
 .../java/org/torproject/android/service/util/Prefs.java    |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d08c3cc4..869bb0d5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -224,14 +224,15 @@ android:summary="@string/pref_torrc_summary"
 android:dialogTitle="@string/pref_torrc_dialog"
 android:defaultValue=""
 />
-    
-  
+
+
 <CheckBoxPreference
 android:key="pref_enable_logging"
 android:defaultValue="false"
 android:title="Debug Log"
 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: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>
 </PreferenceScreen>
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 10fa376f..012625b8 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -94,7 +94,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
     private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT;
     
     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 HS_NOTIFY_ID = 4;
 
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 9ceec989..5bfaf7c4 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
@@ -77,7 +77,7 @@ public class Prefs {
     }
 
     public static void disableTransparentProxying() {
-        prefs.getBoolean(PREF_TRANSPARENT, false);
+        putBoolean(PREF_TRANSPARENT, false);
     }
 
     public static boolean transparentProxyAll() {