Commit 62dc73ee authored by cypherpunks1's avatar cypherpunks1 Committed by morgan
Browse files

fixup! [android] Disable features and functionality 

Bug 41550: Disable and remove the search telemetry extensions
parent 2ab88919

mobile/android/android-components/components/feature/search/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ apply plugin: 'kotlin-android' 


android {

    androidResources {

        ignoreAssetsPattern '!amazon*:!azerdict*:!baidu*:!bing*:!ceneje*:!coccoc*:!daum*:!ebay*:!ecosia*:!faclair*:!google*:!gulesider*:!leo*:!mapy*:!mercadolibre*:!odpiralni*:!pazaruvaj*:!prisjakt*:!qwant*:!rakuten*:!salidzinilv*:!seznam*:!vatera*:!wikipedia-*:!wiktionary*:!yahoo*:!yandex*'

        ignoreAssetsPattern '!<dir>extensions:!search_telemetry_v2.json:!amazon*:!azerdict*:!baidu*:!bing*:!ceneje*:!coccoc*:!daum*:!ebay*:!ecosia*:!faclair*:!google*:!gulesider*:!leo*:!mapy*:!mercadolibre*:!odpiralni*:!pazaruvaj*:!prisjakt*:!qwant*:!rakuten*:!salidzinilv*:!seznam*:!vatera*:!wikipedia-*:!wiktionary*:!yahoo*:!yandex*'

    }



    defaultConfig {

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

+13 −11
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ import mozilla.components.feature.readerview.ReaderViewMiddleware 
import mozilla.components.feature.recentlyclosed.RecentlyClosedMiddleware

import mozilla.components.feature.recentlyclosed.RecentlyClosedTabsStorage

import mozilla.components.feature.search.ext.createApplicationSearchEngine

import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware

// import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware

import mozilla.components.feature.search.middleware.SearchExtraParams

import mozilla.components.feature.search.middleware.SearchMiddleware

import mozilla.components.feature.search.region.RegionMiddleware

import mozilla.components.feature.search.telemetry.SerpTelemetryRepository

import mozilla.components.feature.search.telemetry.ads.AdsTelemetry

import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry

// import mozilla.components.feature.search.telemetry.SerpTelemetryRepository

// import mozilla.components.feature.search.telemetry.ads.AdsTelemetry

// import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry

import mozilla.components.feature.session.HistoryDelegate

import mozilla.components.feature.session.middleware.LastAccessMiddleware

import mozilla.components.feature.session.middleware.undo.UndoMiddleware
@@ -296,7 +296,7 @@ class Core( 
                ),

                RecordingDevicesMiddleware(context, context.components.notificationsDelegate),

                PromptMiddleware(),

                AdsTelemetryMiddleware(adsTelemetry),

//              AdsTelemetryMiddleware(adsTelemetry),

                LastMediaAccessMiddleware(),

                HistoryMetadataMiddleware(historyMetadataService),

                SessionPrioritizationMiddleware(),
@@ -326,6 +326,7 @@ class Core( 
            // Install the "icons" WebExtension to automatically load icons for every visited website.

            icons.install(engine, this)



/*

            CoroutineScope(Dispatchers.Main).launch {

                val readJson = { context.assets.readJSONObject("search/search_telemetry_v2.json") }

                val providerList = withContext(Dispatchers.IO) {
@@ -345,6 +346,7 @@ class Core( 
                // Install the "cookies" WebExtension and tracks user interaction with SERPs.

                searchTelemetry.install(engine, this@apply, providerList)

            }

*/



            WebNotificationFeature(

                context,
@@ -390,13 +392,13 @@ class Core( 
        context.components.analytics.metrics

    }



    val adsTelemetry by lazyMonitored {

        AdsTelemetry()

    }

//  val adsTelemetry by lazyMonitored {

//      AdsTelemetry()

//  }



    val searchTelemetry by lazyMonitored {

        InContentTelemetry()

    }

//  val searchTelemetry by lazyMonitored {

//      InContentTelemetry()

//  }



    /**

     * Shortcut component for managing shortcuts on the device home screen.