summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-11-28 18:01:07 +0000
committercyberta <cyberta@riseup.net>2021-11-28 18:01:07 +0000
commitda382d031d07b8c4197c4dae68a2fd5afe93eb5e (patch)
treeb25424107b4fec410c7bae8a8cc68904c9af3b57 /app/src/main
parent11fa383310cbcc1ffea6ff7cfbddd8b639c7697f (diff)
parentabcee0fbe2384302efc523fe65a6b6d0dee17e36 (diff)
Merge branch 'hide_circumvention' into 'master'
hide snowflake See merge request leap/bitmask_android!150
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java2
-rw-r--r--app/src/main/res/layout/f_settings.xml1
3 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
index d4f142ef..5ea70085 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
@@ -70,7 +70,7 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
initExcludeAppsEntry(view);
initPreferUDPEntry(view);
initUseBridgesEntry(view);
- initUseSnowflakeEntry(view);
+ //initUseSnowflakeEntry(view);
initFirewallEntry(view);
initTetheringEntry(view);
setActionBarTitle(this, advanced_settings);
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
index fe9100cb..2b381bc4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
@@ -167,7 +167,7 @@ public class PreferenceHelper {
}
public static Boolean getUseSnowflake(SharedPreferences preferences) {
- return preferences.getBoolean(USE_SNOWFLAKE, true);
+ return preferences.getBoolean(USE_SNOWFLAKE, false);
}
public static void useSnowflake(Context context, boolean isEnabled) {
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml
index ada74e12..398d2c86 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -74,6 +74,7 @@
app:text="@string/use_snowflake"
app:subtitle="@string/snowflake_description"
app:singleLine="false"
+ android:visibility="gone"
/>
<androidx.appcompat.widget.AppCompatTextView