commit b46195c14ba177e74fa6f69c9244a66c06951488
Author: n8fr8 <nathan(a)guardianproject.info>
Date: Fri Apr 9 14:29:11 2021 -0400
remove Meek supprt from briges (MSFT Azure no longer supports domain fronting)
---
.../android/ui/onboarding/BridgeWizardActivity.java | 11 -----------
app/src/main/res/layout/content_bridge_wizard.xml | 2 ++
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 2f29300d..916541c6 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -39,7 +39,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
private static HostTester runningHostTest;
private RadioButton mBtDirect;
private RadioButton mBtObfs4;
- private RadioButton mBtMeek;
private RadioButton mBtCustom;
private RadioButton mBtSnowflake;
private View mBtnConfgiureCustomBridges;
@@ -116,14 +115,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
testBridgeConnection();
});
- mBtMeek = findViewById(R.id.btnBridgesMeek);
- mBtMeek.setOnCheckedChangeListener((buttonView, isChecked) -> {
- if (!isChecked) return;
- Prefs.setBridgesList("meek");
- Prefs.putBridgesEnabled(true);
- testBridgeConnection();
- });
-
mBtSnowflake = findViewById(R.id.btnBridgesSnowflake);
mBtSnowflake.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (!isChecked) return;
@@ -252,8 +243,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
Log.d(getClass().getSimpleName(), String.format("bridgesEnabled=%b, bridgesList=%s", Prefs.bridgesEnabled(), Prefs.getBridgesList()));
if (noBridgesSet()) {
mBtDirect.setChecked(true);
- } else if (Prefs.getBridgesList().equals("meek")) {
- mBtMeek.setChecked(true);
} else if (Prefs.getBridgesList().equals("obfs4")) {
mBtObfs4.setChecked(true);
} else if (Prefs.getBridgesList().equals("snowflake")) {
diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml
index d5bdea3d..6dbca868 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -51,12 +51,14 @@
android:layout_margin="12dp"
android:text="@string/bridge_community" />
+ <!--
<RadioButton
android:id="@+id/btnBridgesMeek"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:text="@string/bridge_cloud" />
+ -->
<RadioButton
android:id="@+id/btnBridgesSnowflake"