Commit 7bbc1092 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

fixup! BB 40925: Implemented the Security Level component 

Bug 45109: No value passed for parameter 'jsEnabled'
parent bd655fc9

mobile/android/android-components/components/feature/intent/src/main/java/mozilla/components/feature/intent/processing/TabIntentProcessor.kt

+1 −1
Changes for mobile/android/android-components/components/feature/intent/src/main/java/mozilla/components/feature/intent/processing/TabIntentProcessor.kt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class TabIntentProcessor( 
    private val newTabSearchUseCase: SearchUseCases.NewTabSearchUseCase,

    private val isPrivate: Boolean = false,

    private val engine: Engine? = null,

    private val jsEnabled: Boolean,

    private val jsEnabled: Boolean = true,

) : IntentProcessor {



    private val logger = Logger("TabIntentProcessor")

mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt

+4 −4
Changes for mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class SearchUseCases( 
    store: BrowserStore,

    tabsUseCases: TabsUseCases,

    sessionUseCases: SessionUseCases,

    jsEnabled: Boolean,

    jsEnabled: Boolean = true,

) {

    interface SearchUseCase {

        /**
@@ -43,7 +43,7 @@ class SearchUseCases( 
        private val store: BrowserStore,

        private val tabsUseCases: TabsUseCases,

        private val sessionUseCases: SessionUseCases,

        private val jsEnabled: Boolean,

        private val jsEnabled: Boolean = true,

    ) : SearchUseCase {

        private val logger = Logger("DefaultSearchUseCase")
@@ -134,7 +134,7 @@ class SearchUseCases( 
        private val store: BrowserStore,

        private val tabsUseCases: TabsUseCases,

        private val isPrivate: Boolean,

        private val jsEnabled: Boolean,

        private val jsEnabled: Boolean = true,

    ) : SearchUseCase {

        private val logger = Logger("NewTabSearchUseCase")
@@ -172,7 +172,7 @@ class SearchUseCases( 
            parentSessionId: String? = null,

            flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(),

            additionalHeaders: Map<String, String>? = null,

            jsEnabled: Boolean,

            jsEnabled: Boolean = true,

        ) {

            val resolvedEngine = searchEngine ?: store.state.search.selectedOrDefaultSearchEngine(isPrivate)

            val searchUrl = resolvedEngine?.let {

mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt

+1 −1
Changes for mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ private const val OS_PARAM_OPTIONAL = "\\{" + "(?:\\w+:)?\\w+?" + "\\}" 
internal class SearchUrlBuilder(

    private val searchEngine: SearchEngine,

) {

    fun buildSearchUrl(searchTerms: String, jsEnabled: Boolean): String {

    fun buildSearchUrl(searchTerms: String, jsEnabled: Boolean = true): String {

        // The parser should have put the best URL for this device at the beginning of the list.

        var template = searchEngine.resultUrls[0]

        if (!jsEnabled && (searchEngine.id == "ddg" || searchEngine.id == "ddg-onion")) {

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

+1 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/usecases/FenixBrowserUseCases.kt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class FenixBrowserUseCases( 
    private val searchUseCases: SearchUseCases,

    private val homepageTitle: String,

    private val profiler: Profiler?,

    private val jsEnabled: Boolean,

    private val jsEnabled: Boolean = true,

) {

    /**

     * Loads a URL or performs a search depending on the value of [searchTermOrURL].