Skip to content
Snippets Groups Projects

BB/TB 43413: Rebased onto 132.0a1

Merged BB/TB 43413: Rebased onto 132.0a1
pierov/tor-browser:43413-132.0a1-rebase into tor-browser-132.0a1-15.0-1
All threads resolved!
Merged Pier Angelo Vendrame requested to merge pierov/tor-browser:43413-132.0a1-rebase into tor-browser-132.0a1-15.0-1
All threads resolved!

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 :tada:).

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Pier Angelo Vendrame added 15.0 stable All Platforms esr-140 labels

    added 15.0 stable All Platforms esr-140 labels

  • Pier Angelo Vendrame requested review from @ma1

    requested review from @ma1

  • Pier Angelo Vendrame assigned to @pierov

    assigned to @pierov

    • Pier Angelo Vendrame
      Pier Angelo Vendrame @pierov ·
      Author Maintainer
      Resolved by clairehurst

      The Linux build succeeded and I did some basic stuff with it.

      However, I got these errors on Android:

      > Task :app:processFenixNightlyResources FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':app:processFenixNightlyResources'.
> A failure occurred while executing com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask$TaskAction
   > Android resource linking failed
[...]
     org.mozilla.fenix.app-main-189:/mipmap-anydpi-v26/ic_launcher_alternative.xml:7: error: resource drawable/ic_launcher_foreground (aka org.torproject.torbrowser_nightly:drawable/ic_launcher_foreground) not found.
     org.mozilla.fenix.app-main-189:/mipmap-anydpi-v26/ic_launcher_alternative.xml:8: error: resource drawable/ic_launcher_monochrome (aka org.torproject.torbrowser_nightly:drawable/ic_launcher_monochrome) not found.
     org.mozilla.fenix.app-main-189:/mipmap-anydpi-v26/ic_launcher_round_alternative.xml:7: error: resource drawable/ic_launcher_foreground (aka org.torproject.torbrowser_nightly:drawable/ic_launcher_foreground) not found.
     org.mozilla.fenix.app-main-189:/mipmap-anydpi-v26/ic_launcher_round_alternative.xml:8: error: resource drawable/ic_launcher_monochrome (aka org.torproject.torbrowser_nightly:drawable/ic_launcher_monochrome) not found.

      @clairehurst @dan do you know what could be wrong here?

    • Pier Angelo Vendrame
      Pier Angelo Vendrame @pierov ·
      Author Maintainer
      Resolved by Pier Angelo Vendrame

      @henry do you have a suggestion/preference for a couple of new variables that stylelint now doesn't like?

      The error is:

      /builds/pierov/tor-browser/browser/components/abouttor/content/aboutTor.css
  198:5  error  Avoid using the base color variable "--color-gray-05" directly; use an existing semantic token or map it to a new semantic variable instead.   stylelint-plugin-mozilla/no-base-design-tokens (stylelint)
  208:5  error  Avoid using the base color variable "--color-gray-100" directly; use an existing semantic token or map it to a new semantic variable instead.  stylelint-plugin-mozilla/no-base-design-tokens (stylelint)
  • Pier Angelo Vendrame added 51 commits

    added 51 commits

    • d0cc1d76...3ef439f8 - 41 earlier commits
    • bcadc193 - TB 40026 [android]: Implement Security Level settings on Android.
    • 5dcbf356 - TB 41972: [android] Disable Mozilla onboarding
    • 68f2a292 - TB 41878: [android] Add standalone Tor Bootstrap
    • 5e936265 - TB 40041 [android]: Implement Tor Network Settings
    • 2774b377 - [android] Implement Android-native Connection Assist UI
    • 3af7360f - TB 42655 [android]: Implement "New circuit for this site" on Android
    • dc0dc391 - TB 42089: [android] Remove ability to submit site support requests
    • 93ade398 - [android] Delete unused media
    • c93f5729 - [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix...
    • 0eaeb72b - TB 43243: [android] Implement Android launch test

    Compare with previous version

    Toggle commit list
  • clairehurst mentioned in issue #43543

    mentioned in issue #43543

  • Pier Angelo Vendrame added 17 commits

    added 17 commits

    • 0eaeb72b...6335202c - 7 earlier commits
    • 8308d8bd - TB 40026 [android]: Implement Security Level settings on Android.
    • e4315601 - TB 41972: [android] Disable Mozilla onboarding
    • 018fe541 - TB 41878: [android] Add standalone Tor Bootstrap
    • 9a70ca40 - TB 40041 [android]: Implement Tor Network Settings
    • 97d5740a - [android] Implement Android-native Connection Assist UI
    • b3fc04bd - TB 42655 [android]: Implement "New circuit for this site" on Android
    • c44fee3e - TB 42089: [android] Remove ability to submit site support requests
    • 696e05af - [android] Delete unused media
    • 6f99642e - [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix...
    • 78af4019 - TB 43243: [android] Implement Android launch test

    Compare with previous version

    Toggle commit list
  • Pier Angelo Vendrame marked this merge request as draft from pierov/tor-browser@27f035ae

    marked this merge request as draft from pierov/tor-browser@27f035ae

  • Pier Angelo Vendrame added 15 commits

    added 15 commits

    • 78af4019...b247c410 - 5 earlier commits
    • 0f5166a9 - TB 40026 [android]: Implement Security Level settings on Android.
    • 422b2d54 - TB 41972: [android] Disable Mozilla onboarding
    • 93eac648 - TB 41878: [android] Add standalone Tor Bootstrap
    • 3ecc0f14 - TB 40041 [android]: Implement Tor Network Settings
    • 467e9a73 - [android] Implement Android-native Connection Assist UI
    • 7dd516e6 - TB 42655 [android]: Implement "New circuit for this site" on Android
    • fa35b193 - TB 42089: [android] Remove ability to submit site support requests
    • 65cc004a - [android] Delete unused media
    • 4ee361e8 - [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix...
    • 927fcba8 - TB 43243: [android] Implement Android launch test

    Compare with previous version

    Toggle commit list
  • Pier Angelo Vendrame marked this merge request as ready

    marked this merge request as ready

  • clairehurst resolved all threads

    resolved all threads

  • ma1
    ma1 @ma1 ·
    Maintainer

    Thanks for the hard work and the notes.

    Lgmt!

  • ma1 approved this merge request

    approved this merge request

  • Pier Angelo Vendrame merged

    merged

Please register or sign in to reply