fixup! Bug 42247: Android helpers for the TorProvider (ffdae1ad) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/Prefs.java

+10 −2

Changes for mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/Prefs.java: 10 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -49,14 +49,22 @@ import java.util.Locale;

		public static boolean bridgesEnabled() {
		setContext();
		// for Locale.getDefault().getLanguage().equals("fa"), bridges were enabled by default (and
		// it was meek). This was a default set in 2019 code, but it is not a good default anymore,
		// so we removed the check.
		return prefs.getBoolean(PREF_BRIDGES_ENABLED, false);
		}

		public static String getBridgesList() {
		setContext();
		// was "meek" for (Locale.getDefault().getLanguage().equals("fa")) and "obfs4" for the rest from a 2019 commit
		// but that has stopped representing a good default sometime since so not importing for new users
		String list = prefs.getString(PREF_BRIDGES_LIST, "");
		// list might be empty if the default PT was used, so check also if bridges are enabled.
		if (list.isEmpty() && prefs.getBoolean(PREF_BRIDGES_ENABLED, false)) {
		// Even though the check on the fa locale is not good to enable bridges by default, we
		// still check it here, because if the list was empty, it was likely that it was the
		// choice for users with this locale.
		return (Locale.getDefault().getLanguage().equals("fa")) ? "meek": "obfs4";
		}
		return list;
		}

+3 −5

Changes for mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java: 3 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -53,13 +53,11 @@ public class TorLegacyAndroidSettings {
		settings.bridgesSource = TorSettings.BridgeSource.BuiltIn;
		switch (userDefinedBridgeList) {
		case "obfs4":
		settings.bridgesBuiltinType = "objs4";
		case "snowflake":
		settings.bridgesBuiltinType = userDefinedBridgeList;
		break;
		case "meek":
		settings.bridgesBuiltinType = "meek_azure";
		break;
		case "snowflake":
		settings.bridgesBuiltinType = "snowflake";
		settings.bridgesBuiltinType = "meek-azure";
		break;
		default:
		settings.bridgesSource = TorSettings.BridgeSource.Invalid;