Skip to content

BB/TB 43413: Rebased onto 132.0a1

Pier Angelo Vendramerequested to merge
pierov/tor-browser:43413-132.0a1-rebase into tor-browser-132.0a1-15.0-1

Merge Info

Rebase Issue

Release Prep Issue

  • tor-browser-build#xxxxx

Issue Tracking

Review

Request Reviewer

  • Request review from a release engineer: boklm, dan, ma1, morgan, pierov

Change Description

Rebased from 131.0a1 to 132.0a1.

Notice: I started from 785c7f05, since the first commit conflicted, but it was a backport of a patch we did.

I decided not to note down the trivial changes, and instead write only notes about those who are less easy to understand or that involved some change from me.

Hopefully, these notes are enough, but if needed I can provide a commented range-diff.

47b95951... BB 42831: Remove the shopping components.

browser/base/content/browser.js: isProductURL removed upstream (by Henry, f0224e83).

537fc3cb... BB 40002: Remove about:ion

about:ion has been removed upstream in Bug 1913704 (bd21141a).

Thus, I also updated the commit message.

784ee9bc... BB 42037: Disable about:firefoxview page

browser/themes/shared/tabbrowser/tabs.css: small selector change upstream (+ to ~). However, we remove all of that, so no consequence for us.

39799007... TB 7494: Create local home page for TBB.

browser/components/BrowserContentHandler.sys.mjs: upstream refactor (b9549828). As per our comment, we were moving the homepage retrieval to earlier, because we needed to know if about:tor was our homepage. However, now upstream checks this even before us, so I dropped the comment (and this reduced the size of our patch for that file 🎉).

Anyway, Opened #43532 to do a better check.

84d7da69... TB 34378: [android] Port external helper app prompting

Conflicts because of 93e2b679. isSameCallerAndApp has been completely refactored to also allow external apps without prompt when authenticating (and the new function is called isAuthentication).

Opened #43533 for further checks about linkability threats of this.

d9544cdc... [android] Disable features and functionality

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt: the lines about shoppingExperienceFeature.isEnabled were removed in f8e10d31.

I think this was mostly for telemetry, so we shouldn't need to follow up (if I understand correctly, it's all removed code, it wasn't moved anywhere else).

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt:

  • isExperimentationEnabled now defaults to isTelemetryEnabled, rather than true. I left upstream's default, rather than changing it.
  • upstream removed a couple of metrics: enabledTotalCookieProtectionCFR and shouldShowTotalCookieProtectionCFR
  • new metrics in general

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt: shouldDefaultToBottomToolbar was removed (49cabef3).

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt: the test for the toolbar position was removed as well, so no need to comment it anymore.

50016b48... TB 34403 [android]: Disable Normal mode by default.

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt: CompositionLocalProvider went away, so there's an indentation change.

44693c9c... [android] Modify UI/UX

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt: we remove a huge block... Upstream removed some stuff as well. So, I commented the remaining.

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt: the SITE_NOT_SUPPORTED upstream removed in 130 came back. I accepted a patch similar to the one we have in 128.

fb3531e6... [android] Delete unused media

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt: one of the changes is inside a block we comment on another patch. Therefore, I dropped the change. It's a bout the sync'ed tabs, so I doubt we'll ever uncomment it.

Merge request reports