Verified Commit 4b06c834 authored by clairehurst's avatar clairehurst 🌱 Committed by ma1
Browse files

fixup! [android] Modify add-on support

TB 44827: Always enable noscript for android
parent e332f1c4
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ import java.util.concurrent.TimeUnit
import kotlin.math.roundToLong
import mozilla.components.support.AppServicesInitializer.Config as AppServicesConfig

import org.mozilla.fenix.components.TorBrowserFeatures.NOSCRIPT_ID


private const val RAM_THRESHOLD_MEGABYTES = 1024
private const val BYTES_TO_MEGABYTES_CONVERSION = 1024.0 * 1024.0

@@ -883,6 +886,15 @@ open class FenixApplication : Application(), Provider, ThemeProvider {
                    components.useCases.tabsUseCases.selectTab(sessionId)
                },
                onExtensionsLoaded = { extensions ->
                    // enable noscript if it is disabled
                    extensions.find { extension : WebExtension ->
                        extension.id == NOSCRIPT_ID
                    }?.let { noScript ->
                        if (!noScript.isEnabled()) {
                            components.core.engine.enableWebExtension(noScript)
                        }
                    }

                    // Delay until bootstrap is finished so that it will actually update tor-browser#44303
                    components.torController.registerRunOnceBootstrapped(object : RunOnceBootstrapped {
                        override fun onBootstrapped() {
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import org.mozilla.fenix.tor.RunOnceBootstrapped

object TorBrowserFeatures {
    private val logger = Logger("torbrowser-features")
    private const val NOSCRIPT_ID = "{73a6fe31-595d-460b-a920-fcc0f8843232}"
    const val NOSCRIPT_ID = "{73a6fe31-595d-460b-a920-fcc0f8843232}"

    private fun installNoScript(
        context: Context,