Verified Commit 9ac75464 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! [android] Enable the connect assist experiments on alpha 

Bug 42628: Remove browser.tor_android.use_new_bootstrap.
parent 71113320

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

+0 −6
Original line number Diff line number Diff line
@@ -1347,11 +1347,6 @@ class GeckoEngine( 
                    localeUpdater.updateValue()

                }

            }

        override var useNewBootstrap: Boolean

            get() = runtime.settings.useNewBootstrap

            set(value) {

                runtime.settings.useNewBootstrap = value

            }

    }.apply {

        defaultSettings?.let {

            this.javascriptEnabled = it.javascriptEnabled
@@ -1380,7 +1375,6 @@ class GeckoEngine( 
            this.emailTrackerBlockingPrivateBrowsing = it.emailTrackerBlockingPrivateBrowsing

            this.torSecurityLevel = it.torSecurityLevel

            this.spoofEnglish = it.spoofEnglish

            this.useNewBootstrap = it.useNewBootstrap

        }

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ abstract class Settings { 


    open var spoofEnglish: Boolean by UnsupportedSetting()



    open var useNewBootstrap: Boolean by UnsupportedSetting()

}



/**
@@ -312,7 +311,6 @@ data class DefaultSettings( 
    override var emailTrackerBlockingPrivateBrowsing: Boolean = false,

    override var torSecurityLevel: Int = 4,

    override var spoofEnglish: Boolean = false,

    override var useNewBootstrap: Boolean = true,

) : Settings()



class UnsupportedSetting<T> {