Commit b3c3b0a1 authored by henry's avatar henry
Browse files

fixup! TB 41878: [android] Add standalone Tor Bootstrap 

TB 44068: Migrate from "meek-azure" to "meek" name for built-in bridge types.
parent a696660b

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ enum class TorBridgeTransportConfig( 
        preferenceKey = R.string.pref_key_tor_network_settings_bridge_config_builtin_bridge_obfs4,

        transportName = "obfs4"

    ),

    BUILTIN_MEEK_AZURE(

    BUILTIN_MEEK(

        preferenceKey = R.string.pref_key_tor_network_settings_bridge_config_builtin_bridge_meek_azure,

        transportName = "meek"

    ),
@@ -38,8 +38,8 @@ object TorBridgeTransportConfigUtil { 
        return when (bridge) {

            TorBridgeTransportConfig.BUILTIN_OBFS4.transportName ->

                TorBridgeTransportConfig.BUILTIN_OBFS4

            TorBridgeTransportConfig.BUILTIN_MEEK_AZURE.transportName ->

                TorBridgeTransportConfig.BUILTIN_MEEK_AZURE

            TorBridgeTransportConfig.BUILTIN_MEEK.transportName ->

                TorBridgeTransportConfig.BUILTIN_MEEK

            TorBridgeTransportConfig.BUILTIN_SNOWFLAKE.transportName ->

                TorBridgeTransportConfig.BUILTIN_SNOWFLAKE

            else -> TorBridgeTransportConfig.USER_PROVIDED

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class TorControllerGV( 
                BridgeSource.BuiltIn -> {

                    when (getTorSettings()?.bridgesBuiltinType) {

                        BridgeBuiltinType.Obfs4 -> TorBridgeTransportConfig.BUILTIN_OBFS4

                        BridgeBuiltinType.MeekAzure -> TorBridgeTransportConfig.BUILTIN_MEEK_AZURE

                        BridgeBuiltinType.Meek -> TorBridgeTransportConfig.BUILTIN_MEEK

                        BridgeBuiltinType.Snowflake -> TorBridgeTransportConfig.BUILTIN_SNOWFLAKE

                        else -> TorBridgeTransportConfig.USER_PROVIDED

                    }
@@ -87,7 +87,7 @@ class TorControllerGV( 
                    it.bridgesSource = BridgeSource.BuiltIn

                    val bbt: BridgeBuiltinType = when (value) {

                        TorBridgeTransportConfig.BUILTIN_OBFS4 -> BridgeBuiltinType.Obfs4

                        TorBridgeTransportConfig.BUILTIN_MEEK_AZURE -> BridgeBuiltinType.MeekAzure

                        TorBridgeTransportConfig.BUILTIN_MEEK -> BridgeBuiltinType.Meek

                        TorBridgeTransportConfig.BUILTIN_SNOWFLAKE -> BridgeBuiltinType.Snowflake

                        else -> BridgeBuiltinType.Invalid

                    }