Merge branch 'enable_snowflake_feature' into 'master'

build and enable snowflake feature

See merge request leap/bitmask_android!170

3 files changed, 3 insertions, 3 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 a20d0b73..be2fe4f4 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
@@ -71,7 +71,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 2b381bc4..fe9100cb 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, false);
+        return preferences.getBoolean(USE_SNOWFLAKE, true);
     }
 
     public static void useSnowflake(Context context, boolean isEnabled) {
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index fbac5995..83fed5e8 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -15,7 +15,7 @@ DIR_GOLIBS=./bitmaskcore/lib/
 DIR_TORLIBS=./tor-android/external/lib
 EXPECTED_NDK_VERSION="21.4.7075529"
 EXPECTED_ANDROID_NDK_RELEASE_VERSION="r21e"
-BUILD_TOR=false
+BUILD_TOR=true
 
 # init
 # look for empty dir