[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 5 commits: fixup! Bug 40009: [android] Change the default search engines
morgan (@morgan)
git at gitlab.torproject.org
Thu Sep 19 01:49:52 UTC 2024
morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2ab88919 by cypherpunks1 at 2024-09-19T01:46:39+00:00
fixup! Bug 40009: [android] Change the default search engines
Bug 43147: Remove unused search plugins from the apk files
- - - - -
62dc73ee by cypherpunks1 at 2024-09-19T01:46:39+00:00
fixup! [android] Disable features and functionality
Bug 41550: Disable and remove the search telemetry extensions
- - - - -
1e47b9e6 by cypherpunks1 at 2024-09-19T01:46:39+00:00
fixup! [android] Add Tor integration and UI
Bug 41550: Move webcompat changes to another commit
- - - - -
9e8f177c by cypherpunks1 at 2024-09-19T01:46:39+00:00
fixup! [android] Modify UI/UX
Bug 41550: Disable the webcompat and webcompat-reporter features
- - - - -
a5048088 by cypherpunks1 at 2024-09-19T01:46:39+00:00
fixup! [android] Disable features and functionality
Bug 41550: Disable and remove the fxawebchannel extension
- - - - -
7 changed files:
- mobile/android/android-components/components/feature/accounts/build.gradle
- mobile/android/android-components/components/feature/search/build.gradle
- mobile/android/fenix/.buildconfig.yml
- mobile/android/fenix/app/build.gradle
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
Changes:
=====================================
mobile/android/android-components/components/feature/accounts/build.gradle
=====================================
@@ -8,6 +8,10 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
+ androidResources {
+ ignoreAssetsPattern '!<dir>extensions'
+ }
+
defaultConfig {
minSdkVersion config.minSdkVersion
compileSdk config.compileSdkVersion
=====================================
mobile/android/android-components/components/feature/search/build.gradle
=====================================
@@ -8,6 +8,10 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
+ androidResources {
+ 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 {
minSdkVersion config.minSdkVersion
compileSdk config.compileSdkVersion
=====================================
mobile/android/fenix/.buildconfig.yml
=====================================
@@ -56,8 +56,8 @@ projects:
- feature-toolbar
- feature-top-sites
- feature-webauthn
- - feature-webcompat
- - feature-webcompat-reporter
+# - feature-webcompat
+# - feature-webcompat-reporter
- feature-webnotifications
- lib-crash
- lib-crash-sentry
=====================================
mobile/android/fenix/app/build.gradle
=====================================
@@ -633,9 +633,9 @@ dependencies {
implementation project(':feature-share')
implementation project(':feature-accounts-push')
implementation project(':feature-webauthn')
- implementation project(':feature-webcompat')
+// implementation project(':feature-webcompat')
implementation project(':feature-webnotifications')
- implementation project(':feature-webcompat-reporter')
+// implementation project(':feature-webcompat-reporter')
implementation project(':service-pocket')
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
import mozilla.components.concept.engine.permission.SitePermissions
import mozilla.components.concept.engine.prompt.ShareData
import mozilla.components.concept.storage.LoginEntry
-import mozilla.components.feature.accounts.FxaCapability
-import mozilla.components.feature.accounts.FxaWebChannelFeature
+// import mozilla.components.feature.accounts.FxaCapability
+// import mozilla.components.feature.accounts.FxaWebChannelFeature
import mozilla.components.feature.app.links.AppLinksFeature
import mozilla.components.feature.contextmenu.ContextMenuCandidate
import mozilla.components.feature.contextmenu.ContextMenuFeature
@@ -254,7 +254,7 @@ abstract class BaseBrowserFragment :
private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
private val fullScreenFeature = ViewBoundFeatureWrapper<FullScreenFeature>()
private val swipeRefreshFeature = ViewBoundFeatureWrapper<SwipeRefreshFeature>()
- private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
+// private val webchannelIntegration = ViewBoundFeatureWrapper<FxaWebChannelFeature>()
private val sitePermissionWifiIntegration =
ViewBoundFeatureWrapper<SitePermissionsWifiIntegration>()
private val secureWindowFeature = ViewBoundFeatureWrapper<SecureWindowFeature>()
@@ -1022,6 +1022,7 @@ abstract class BaseBrowserFragment :
)
}
+/*
webchannelIntegration.set(
feature = FxaWebChannelFeature(
customTabSessionId,
@@ -1034,6 +1035,7 @@ abstract class BaseBrowserFragment :
owner = this,
view = view,
)
+*/
initializeEngineView(
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
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
import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage
import mozilla.components.feature.top.sites.DefaultTopSitesStorage
import mozilla.components.feature.top.sites.PinnedSiteStorage
-import mozilla.components.feature.webcompat.WebCompatFeature
-import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
+// import mozilla.components.feature.webcompat.WebCompatFeature
+// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
import mozilla.components.feature.webnotifications.WebNotificationFeature
import mozilla.components.lib.dataprotect.SecureAbove22Preferences
import mozilla.components.service.contile.ContileTopSitesProvider
@@ -166,6 +166,7 @@ class Core(
defaultSettings,
geckoRuntime,
).also {
+// WebCompatFeature.install(it)
/**
* There are some issues around localization to be resolved, as well as questions around
@@ -173,10 +174,9 @@ class Core(
* disabled in Fenix Release builds for now.
* This is consistent with both Fennec and Firefox Desktop.
*/
- if (false && (Config.channel.isNightlyOrDebug || Config.channel.isBeta)) {
- WebCompatFeature.install(it)
- WebCompatReporterFeature.install(it, "fenix")
- }
+// if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {
+// WebCompatReporterFeature.install(it, "fenix")
+// }
TorBrowserFeatures.install(context, it)
}
@@ -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 at 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.
=====================================
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
import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.concept.storage.BookmarksStorage
import mozilla.components.feature.top.sites.PinnedSiteStorage
+// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
import mozilla.components.lib.state.ext.flowScoped
import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a3e97048f4aebff76624fbaea0a1fcc08e50d90d...a50480888f3a3f445342ab124b97fcca4f98e457
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a3e97048f4aebff76624fbaea0a1fcc08e50d90d...a50480888f3a3f445342ab124b97fcca4f98e457
You're receiving this email because of your account on gitlab.torproject.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240919/a0c3408b/attachment-0001.htm>
More information about the tor-commits
mailing list