summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-11-28 18:07:03 +0100
committercyBerta <cyberta@riseup.net>2021-11-28 18:07:03 +0100
commit27aefab48e1423c763ed477c720cae7c11ca0f22 (patch)
tree908315b73e07f889533a47a35907c93efb16f15b /app/src
parent11fa383310cbcc1ffea6ff7cfbddd8b639c7697f (diff)
hide snowflake in the settings, disable fallback mechanism, comment out snowflake/tor tests
Diffstat (limited to 'app/src')
-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
-rw-r--r--app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java13
4 files changed, 13 insertions, 5 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 {