commit 9cf66800aa9b6378460499e66fac27773ad46058 Author: b dsnake@protonmail.com Date: Tue Dec 14 18:06:38 2021 -0500
for now, disable snowflake proxy limiting --- app/src/main/res/xml/preferences.xml | 10 +++++----- .../java/org/torproject/android/service/OrbotService.java | 11 +---------- 2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 28e06052..c1fb75ae 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -297,11 +297,11 @@ android:key="pref_be_a_snowflake" android:title="@string/be_a_snowflake_title" android:summary="@string/be_a_snowflake_desc" /> - <CheckBoxPreference - android:defaultValue="true" - android:key="pref_be_a_snowflake_limit" - android:title="@string/be_a_snowflake_title_limit" - android:summary="@string/be_a_snowflake_desc_limit" /> +<!-- <CheckBoxPreference--> +<!-- android:defaultValue="false"--> +<!-- android:key="pref_be_a_snowflake_limit"--> +<!-- android:title="@string/be_a_snowflake_title_limit"--> +<!-- android:summary="@string/be_a_snowflake_desc_limit" />--> </PreferenceCategory>
</PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 4b9a12e6..1b15e0da 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1412,16 +1412,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb else if (useIPtSnowflakeProxy()) startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) { - - if (Prefs.limitSnowflakeProxying()) - { - if (isChargingAndWifi(OrbotService.this)) - { - enableSnowflakeProxy(); - } - - } - else +// if (Prefs.limitSnowflakeProxying()) { enableSnowflakeProxy(); }
tor-commits@lists.torproject.org