BB/TB 43413: Cherry-picked the remaining 128.7.0esr commits onto 132

Merge Info

Issues

Resolves

• tor-browser#xxxxx
• mullvad-browser#xxxxx
• tor-browser-build#xxxxx

Related

• #43413 (closed)
• mullvad-browser#xxxxx
• tor-browser-build#xxxxx

Merging

Target Branches

• tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

• Alpha: esr128-14.5
• Stable: esr128-14.0
• Legacy: esr115-13.5

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

• Security update: patchset contains a security fix (be sure to select the correct item in Timeline)
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Localization: typos and other localization changes that should be also in the release branch
• Other: please explain

Upstream

• Patchset is a candidate for uplift to Firefox
• Patchset is a backport from Firefox
  • Bugzilla link:
  • Upstream commit:

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since Gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : dan, ma1, pierov, morgan
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : pierov, morgan

Change Description

Cherry-picked tor-browser-128.7.0esr-14.5-1-build1..tor-browser-128.7.0esr-14.5-1 onto 132.

86b24fa4... TB 42669: [android] Use custom no-op app-services

Conflict in the version in mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt. I guess we will always have this conflict in all rebases.

For now, I added -TORBROWSER to the version and set it to release. We'll decide what to do once things stabilize.

I restored upstream settings, for being able to build.

Still, it didn't work, I'll need help from @brizental.

4f30e0a4... fixup! TB 40041 [android]: Implement Tor Network Settings

Conflict in mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt, I think on imports.

d94603fa... fixup! [android] Implement Android-native Connection Assist UI

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt: conflict on the declaration of HomeActivity. However, this commit just renames the TorIntegrationAndroid to TorAndroidIntegration, so it's easy to solve.

Skipped commits

Some commits haven't been cherry-picked because we needed them to fix the CI: b05f3350, 1d4c9a12, ed5dc003.

These were skipped because they were for consistency after linting 132: 67136454, e687a9b7.

How Tested

Built desktop and did some basic browsing, went to the settings, checked for obvious errors in the console.

Didn't manage to build Android because of the application services changes.