morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

7 changed files:

Changes:

  • mobile/android/android-components/components/feature/accounts/build.gradle
    ... ... @@ -8,6 +8,10 @@ apply plugin: 'com.android.library'
    8 8 
     apply plugin: 'kotlin-android'
    9 9
    10 10 
     android {
    11 
    +    androidResources {
    12 
    +        ignoreAssetsPattern '!<dir>extensions'
    13 
    +    }
    14 
    +
    11 15 
         defaultConfig {
    12 16 
             minSdkVersion config.minSdkVersion
    13 17 
             compileSdk config.compileSdkVersion

  • mobile/android/android-components/components/feature/search/build.gradle
    ... ... @@ -8,6 +8,10 @@ apply plugin: 'com.android.library'
    8 8 
     apply plugin: 'kotlin-android'
    9 9
    10 10 
     android {
    11 
    +    androidResources {
    12 
    +        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*'
    13 
    +    }
    14 
    +
    11 15 
         defaultConfig {
    12 16 
             minSdkVersion config.minSdkVersion
    13 17 
             compileSdk config.compileSdkVersion

  • mobile/android/fenix/.buildconfig.yml
    ... ... @@ -56,8 +56,8 @@ projects:
    56 56 
         - feature-toolbar
    57 57 
         - feature-top-sites
    58 58 
         - feature-webauthn
    59 
    -    - feature-webcompat
    60 
    -    - feature-webcompat-reporter
    59 
    +#   - feature-webcompat
    60 
    +#   - feature-webcompat-reporter
    61 61 
         - feature-webnotifications
    62 62 
         - lib-crash
    63 63 
         - lib-crash-sentry

  • mobile/android/fenix/app/build.gradle
    ... ... @@ -633,9 +633,9 @@ dependencies {
    633 633 
         implementation project(':feature-share')
    634 634 
         implementation project(':feature-accounts-push')
    635 635 
         implementation project(':feature-webauthn')
    636 
    -    implementation project(':feature-webcompat')
    636 
    +//  implementation project(':feature-webcompat')
    637 637 
         implementation project(':feature-webnotifications')
    638 
    -    implementation project(':feature-webcompat-reporter')
    638 
    +//  implementation project(':feature-webcompat-reporter')
    639 639
    640 640 
         implementation project(':service-pocket')
    641 641 
         implementation project(':service-contile')

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
    ... ... @@ -67,8 +67,8 @@ import mozilla.components.concept.base.crash.Breadcrumb
    67 67 
     import mozilla.components.concept.engine.permission.SitePermissions
    68 68 
     import mozilla.components.concept.engine.prompt.ShareData
    69 69 
     import mozilla.components.concept.storage.LoginEntry
    70 
    -import mozilla.components.feature.accounts.FxaCapability
    71 
    -import mozilla.components.feature.accounts.FxaWebChannelFeature
    70 
    +// import mozilla.components.feature.accounts.FxaCapability
    71 
    +// import mozilla.components.feature.accounts.FxaWebChannelFeature
    72 72 
     import mozilla.components.feature.app.links.AppLinksFeature
    73 73 
     import mozilla.components.feature.contextmenu.ContextMenuCandidate
    74 74 
     import mozilla.components.feature.contextmenu.ContextMenuFeature
    ... ... @@ -254,7 +254,7 @@ abstract class BaseBrowserFragment :
    254 254 
         private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
    255 255 
         private val fullScreenFeature = ViewBoundFeatureWrapper<FullScreenFeature>()
    256 256 
         private val swipeRefreshFeature = ViewBoundFeatureWrapper<SwipeRefreshFeature>()
    257 
    -    private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
    257 
    +//  private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
    258 258 
         private val sitePermissionWifiIntegration =
    259 259 
             ViewBoundFeatureWrapper<SitePermissionsWifiIntegration>()
    260 260 
         private val secureWindowFeature = ViewBoundFeatureWrapper<SecureWindowFeature>()
    ... ... @@ -1022,6 +1022,7 @@ abstract class BaseBrowserFragment :
    1022 1022 
                 )
    1023 1023 
             }
    1024 1024
    1025 
    +/*
    1025 1026 
             webchannelIntegration.set(
    1026 1027 
                 feature = FxaWebChannelFeature(
    1027 1028 
                     customTabSessionId,
    ... ... @@ -1034,6 +1035,7 @@ abstract class BaseBrowserFragment :
    1034 1035 
                 owner = this,
    1035 1036 
                 view = view,
    1036 1037 
             )
    1038 
    +*/
    1037 1039
    1038 1040 
             initializeEngineView(
    1039 1041 
                 topToolbarHeight = context.settings().getTopToolbarHeight(

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
    ... ... @@ -58,21 +58,21 @@ import mozilla.components.feature.readerview.ReaderViewMiddleware
    58 58 
     import mozilla.components.feature.recentlyclosed.RecentlyClosedMiddleware
    59 59 
     import mozilla.components.feature.recentlyclosed.RecentlyClosedTabsStorage
    60 60 
     import mozilla.components.feature.search.ext.createApplicationSearchEngine
    61 
    -import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware
    61 
    +// import mozilla.components.feature.search.middleware.AdsTelemetryMiddleware
    62 62 
     import mozilla.components.feature.search.middleware.SearchExtraParams
    63 63 
     import mozilla.components.feature.search.middleware.SearchMiddleware
    64 64 
     import mozilla.components.feature.search.region.RegionMiddleware
    65 
    -import mozilla.components.feature.search.telemetry.SerpTelemetryRepository
    66 
    -import mozilla.components.feature.search.telemetry.ads.AdsTelemetry
    67 
    -import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry
    65 
    +// import mozilla.components.feature.search.telemetry.SerpTelemetryRepository
    66 
    +// import mozilla.components.feature.search.telemetry.ads.AdsTelemetry
    67 
    +// import mozilla.components.feature.search.telemetry.incontent.InContentTelemetry
    68 68 
     import mozilla.components.feature.session.HistoryDelegate
    69 69 
     import mozilla.components.feature.session.middleware.LastAccessMiddleware
    70 70 
     import mozilla.components.feature.session.middleware.undo.UndoMiddleware
    71 71 
     import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage
    72 72 
     import mozilla.components.feature.top.sites.DefaultTopSitesStorage
    73 73 
     import mozilla.components.feature.top.sites.PinnedSiteStorage
    74 
    -import mozilla.components.feature.webcompat.WebCompatFeature
    75 
    -import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
    74 
    +// import mozilla.components.feature.webcompat.WebCompatFeature
    75 
    +// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
    76 76 
     import mozilla.components.feature.webnotifications.WebNotificationFeature
    77 77 
     import mozilla.components.lib.dataprotect.SecureAbove22Preferences
    78 78 
     import mozilla.components.service.contile.ContileTopSitesProvider
    ... ... @@ -166,6 +166,7 @@ class Core(
    166 166 
                 defaultSettings,
    167 167 
                 geckoRuntime,
    168 168 
             ).also {
    169 
    +//          WebCompatFeature.install(it)
    169 170
    170 171 
                 /**
    171 172 
                  * There are some issues around localization to be resolved, as well as questions around
    ... ... @@ -173,10 +174,9 @@ class Core(
    173 174 
                  * disabled in Fenix Release builds for now.
    174 175 
                  * This is consistent with both Fennec and Firefox Desktop.
    175 176 
                  */
    176 
    -            if (false && (Config.channel.isNightlyOrDebug || Config.channel.isBeta)) {
    177 
    -                WebCompatFeature.install(it)
    178 
    -                WebCompatReporterFeature.install(it, "fenix")
    179 
    -            }
    177 
    +//          if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {
    178 
    +//              WebCompatReporterFeature.install(it, "fenix")
    179 
    +//          }
    180 180
    181 181 
                 TorBrowserFeatures.install(context, it)
    182 182 
             }
    ... ... @@ -296,7 +296,7 @@ class Core(
    296 296 
                     ),
    297 297 
                     RecordingDevicesMiddleware(context, context.components.notificationsDelegate),
    298 298 
                     PromptMiddleware(),
    299 
    -                AdsTelemetryMiddleware(adsTelemetry),
    299 
    +//              AdsTelemetryMiddleware(adsTelemetry),
    300 300 
                     LastMediaAccessMiddleware(),
    301 301 
                     HistoryMetadataMiddleware(historyMetadataService),
    302 302 
                     SessionPrioritizationMiddleware(),
    ... ... @@ -326,6 +326,7 @@ class Core(
    326 326 
                 // Install the "icons" WebExtension to automatically load icons for every visited website.
    327 327 
                 icons.install(engine, this)
    328 328
    329 
    +/*
    329 330 
                 CoroutineScope(Dispatchers.Main).launch {
    330 331 
                     val readJson = { context.assets.readJSONObject("search/search_telemetry_v2.json") }
    331 332 
                     val providerList = withContext(Dispatchers.IO) {
    ... ... @@ -345,6 +346,7 @@ class Core(
    345 346 
                     // Install the "cookies" WebExtension and tracks user interaction with SERPs.
    346 347 
                     searchTelemetry.install(engine, this@apply, providerList)
    347 348 
                 }
    349 
    +*/
    348 350
    349 351 
                 WebNotificationFeature(
    350 352 
                     context,
    ... ... @@ -390,13 +392,13 @@ class Core(
    390 392 
             context.components.analytics.metrics
    391 393 
         }
    392 394
    393 
    -    val adsTelemetry by lazyMonitored {
    394 
    -        AdsTelemetry()
    395 
    -    }
    395 
    +//  val adsTelemetry by lazyMonitored {
    396 
    +//      AdsTelemetry()
    397 
    +//  }
    396 398
    397 
    -    val searchTelemetry by lazyMonitored {
    398 
    -        InContentTelemetry()
    399 
    -    }
    399 
    +//  val searchTelemetry by lazyMonitored {
    400 
    +//      InContentTelemetry()
    401 
    +//  }
    400 402
    401 403 
         /**
    402 404 
          * Shortcut component for managing shortcuts on the device home screen.

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
    ... ... @@ -31,6 +31,7 @@ import mozilla.components.browser.state.state.TabSessionState
    31 31 
     import mozilla.components.browser.state.store.BrowserStore
    32 32 
     import mozilla.components.concept.storage.BookmarksStorage
    33 33 
     import mozilla.components.feature.top.sites.PinnedSiteStorage
    34 
    +// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
    34 35 
     import mozilla.components.lib.state.ext.flowScoped
    35 36 
     import mozilla.components.support.ktx.android.content.getColorFromAttr
    36 37 
     import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help