Commit 9ef81e64 authored by Alex Catarineu's avatar Alex Catarineu Committed by Pier Angelo Vendrame
Browse files

TB 40087 [android]: Implement a switch for spoof English. 

Originally, fenix#40087 and android-components#40019.
parent 370577e5

mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt

+10 −0
Original line number Diff line number Diff line
@@ -1863,6 +1863,15 @@ class GeckoEngine( 
                value?.let { runtime.settings.setBaselineFingerprintingProtectionOverrides(it) }

            }



        override var spoofEnglish: Boolean

            get() = runtime.settings.spoofEnglish

            set(value) {

                value.let {

                    runtime.settings.spoofEnglish = it

                    localeUpdater.updateValue()

                }

            }



        override var webContentIsolationStrategy: WebContentIsolationStrategy?

            get() = runtime.settings.webContentIsolationStrategy?.intoWebContentIsolationStrategy()

            set(value) {
@@ -2019,6 +2028,7 @@ class GeckoEngine( 
            this.userCharacteristicPingCurrentVersion = it.userCharacteristicPingCurrentVersion

            this.baselineFingerprintingProtection = it.baselineFingerprintingProtection

            this.baselineFingerprintingProtectionOverrides = it.baselineFingerprintingProtectionOverrides

            this.spoofEnglish = it.spoofEnglish

            this.webContentIsolationStrategy = it.webContentIsolationStrategy

            this.fetchPriorityEnabled = it.fetchPriorityEnabled

            this.parallelMarkingEnabled = it.parallelMarkingEnabled

mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt

+3 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ abstract class Settings { 
     */

    open var userCharacteristicPingCurrentVersion: Int by UnsupportedSetting()



    open var spoofEnglish: Boolean by UnsupportedSetting()



    /**

     * Setting to control whether privacy.baselineFingerprintingProtection is enabled.

     * This is enabled by default in all modes.
@@ -504,6 +506,7 @@ data class DefaultSettings( 
    override var useContentBlockingDatabase: Boolean = false,

    override var emailTrackerBlockingPrivateBrowsing: Boolean = false,

    override var userCharacteristicPingCurrentVersion: Int = 0,

    override var spoofEnglish: Boolean = false,

    override var webContentIsolationStrategy: WebContentIsolationStrategy? =

        WebContentIsolationStrategy.ISOLATE_HIGH_VALUE,

    override var fetchPriorityEnabled: Boolean = true,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ class Core( 
            cookieBannerHandlingGlobalRulesSubFrames = context.settings().shouldEnableCookieBannerGlobalRulesSubFrame,

            emailTrackerBlockingPrivateBrowsing = false,

            userCharacteristicPingCurrentVersion = FxNimbus.features.userCharacteristics.value().currentVersion,

            spoofEnglish = context.settings().spoofEnglish,

            getDesktopMode = {

                store.state.desktopMode

            },

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import mozilla.components.browser.state.store.BrowserStore 
import mozilla.components.support.locale.LocaleManager

import mozilla.components.support.locale.LocaleUseCases

import org.mozilla.fenix.nimbus.FxNimbus

import org.mozilla.fenix.ext.components

import java.util.Locale



/**
@@ -141,5 +142,9 @@ class DefaultLocaleSettingsController( 
        config.setLocale(locale)

        config.setLayoutDirection(locale)

        resources.updateConfiguration(config, resources.displayMetrics)

        // A slightly hacky way of triggering a `runtime.settings.locales` update,

        // so that the locales are updated in GeckoView.

        val spoofEnglish = context.components.core.engine.settings.spoofEnglish

        context.components.core.engine.settings.spoofEnglish = spoofEnglish

    }

}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt

+14 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import org.mozilla.fenix.R 
import org.mozilla.fenix.databinding.FragmentLocaleSettingsBinding

import org.mozilla.fenix.e2e.SystemInsetsPaddedFragment

import org.mozilla.fenix.ext.components

import org.mozilla.fenix.ext.requireComponents

import org.mozilla.fenix.ext.settings

import org.mozilla.fenix.ext.showToolbar



/**
@@ -50,6 +52,8 @@ class LocaleSettingsFragment : Fragment(), MenuProvider, SystemInsetsPaddedFragm 
        _binding = FragmentLocaleSettingsBinding.inflate(inflater, container, false)

        val view = binding.root



        bindEnableSwitch()



        val browserStore = requireContext().components.core.store

        val localeUseCase = LocaleUseCases(browserStore)
@@ -64,10 +68,19 @@ class LocaleSettingsFragment : Fragment(), MenuProvider, SystemInsetsPaddedFragm 
                localeUseCase = localeUseCase,

            ),

        )

        localeView = LocaleSettingsView(binding.root, interactor)

        localeView = LocaleSettingsView(binding.localeContainer, interactor)

        return view

    }



    private fun bindEnableSwitch() {

        val switch = binding.enableSwitch

        switch.isChecked = requireComponents.core.engine.settings.spoofEnglish

        switch.setOnCheckedChangeListener { _, isChecked ->

            context?.settings()?.spoofEnglish = isChecked

            requireComponents.core.engine.settings.spoofEnglish = isChecked

        }

    }



    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {

        inflater.inflate(R.menu.languages_list, menu)

        val searchItem = menu.findItem(R.id.search)