diff options
5 files changed, 17 insertions, 7 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 diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java index 4d3049f4..d6ee0def 100644 --- a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java +++ b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java @@ -658,6 +658,10 @@ public class ProviderApiManagerTest { providerApiManager.handleIntent(providerApiCommand); } + /** + * Disabled as long as we hide snowflake in the UI + */ + /* @Test public void test_handleIntentSetupProvider_TorFallback_SecondTryHappyPath() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException { Provider provider = getConfiguredProviderAPIv4(); @@ -675,9 +679,12 @@ public class ProviderApiManagerTest { providerApiManager.handleIntent(providerApiCommand); assertEquals(8118, TorStatusObservable.getProxyPort()); - } + }*/ - @Test + /** + * Disabled as long as we hide snowflake in the UI + */ + /* @Test public void test_handleIntentSetupProvider_TorFallbackStartServiceException_SecondTryFailed() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException { Provider provider = getConfiguredProviderAPIv4(); @@ -694,7 +701,7 @@ public class ProviderApiManagerTest { providerApiManager.handleIntent(providerApiCommand); assertEquals(-1, TorStatusObservable.getProxyPort()); - } + } */ @Test public void test_handleIntentSetupProvider_TorFallbackTimeoutException_SecondTryFailed() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException { diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index fe7d1708..fbac5995 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -15,6 +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 # init # look for empty dir @@ -36,8 +37,9 @@ echo "ndk version: $NDK_VERSION" echo "ANDROID_NDK_HOME: $ANDROID_NDK_HOME" # build tor libs -if [[ $(ls -A ${DIR_TORLIBS}) ]] -then +if [[ ${BUILD_TOR} == false ]]; then + echo "skipping Tor" +elif [[ $(ls -A ${DIR_TORLIBS}) ]]; then echo "Dirty build: Reusing tor libraries" else echo "Clean build: compiling tor libraries" |