commit 0a490c5506b922bc386801fa7fb79d90e2ef325e Author: Georg Koppen gk@torproject.org Date: Tue Jul 2 07:57:08 2019 +0000

Bug 31058: Remove Linus' default bridges

There are no default obfs3 bridges remaining after Linus' ones are gone. Remove the UI and localization. --- .../res/layout/preference_tor_network_select_bridge_type.xml | 11 ----------- .../java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 3 --- mobile/android/base/locales/en-US/torbrowser_strings.dtd | 1 - mobile/android/base/strings.xml.in | 1 - 4 files changed, 16 deletions(-)

diff --git a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml index 2c1632bb8268..4ef5925e233d 100644 --- a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml +++ b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml @@ -74,17 +74,6 @@ android:textSize="16sp" android:text="@string/pref_bridges_type_meek_azure"/> <include layout="@xml/separator" /> - <RadioButton android:id="@+id/radio_pref_bridges_obfs3" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10sp" - android:layout_marginBottom="10sp" - android:buttonTint="@color/tor_bridges_select_builtin" - android:fontFamily="Roboto-Regular" - android:textColor="#DE000000" - android:textSize="16sp" - android:text="@string/pref_bridges_type_obfs3"/> - <include layout="@xml/separator" /> </RadioGroup> </LinearLayout>

diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 2519fed4a8b1..eb21819c720b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -683,9 +683,6 @@ public class TorPreferences extends AppCompatPreferenceActivity { case "meek": buttonId = R.id.radio_pref_bridges_meek_azure; break; - case "obfs3": - buttonId = R.id.radio_pref_bridges_obfs3; - break; }

if (buttonId != -1) { diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 36cff09ee3c3..dd3f0cc06f99 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -48,7 +48,6 @@ <!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too --> <!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)"> <!ENTITY pref_bridges_type_meek_azure "meek-azure"> -<!ENTITY pref_bridges_type_obfs3 "obfs3"> <!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 327755ef68f3..4caca9a4fd6d 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -97,7 +97,6 @@ <string name="pref_choice_tor_bridges_enabled_summary">&pref_choice_tor_bridges_enabled_summary;</string> <string name="pref_bridges_type_obfs4">&pref_bridges_type_obfs4;</string> <string name="pref_bridges_type_meek_azure">&pref_bridges_type_meek_azure;</string> - <string name="pref_bridges_type_obfs3">&pref_bridges_type_obfs3;</string>

<string name="pref_tor_bridges_provide_manual_button_title">&pref_tor_bridges_provide_manual_button_title;</string> <string name="pref_tor_bridges_provide_select_text_title">&pref_tor_bridges_provide_select_text_title;</string>