Skip to content

BB/TB 44063: 142.0a1 first rebase

Rapid release rebase.

Issue: #44063 (closed)

  • 35c192cd... BB 42220: Allow for more file types to be forced-inline.
    • uriloader/base/nsURILoader.cpp: I haven't understood the reason of the conflict...
  • 36fd16af... Tweaks to the build system
    • python/sites/mach.txt: Glean was updated
  • 103f0a11... BB 21431: Clean-up system extensions shipped in Firefox
    • browser/extensions/moz.build: JAR_MANIFESTS += ["jar.mn"] was added at the end of the file
  • 1a6e02a9... BB 31740: Remove some unnecessary RemoteSettings instances
    • netwerk/url-classifier/components.conf: 'categories' was added to the first block we remove. Accepted our version.
  • c784ddc5... BB 30605: Honor privacy.spoof_english in Android
    • mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java: usual conflicts of this commit
  • 8731a2b3... amend! BB 31575: Disable Firefox Home (Activity Stream)
    • browser/components/moz.build: new mozcachedohttp thing
  • 3bb85866... BB 40925: Implemented the Security Level component
    • browser/base/content/browser.js.globals: usual things with JSON and commas
    • mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java: like above
  • c2d283dc... BB 40926: Implemented the New Identity feature
    • browser/base/content/browser.js.globals: ditto
    • browser/components/moz.build: like above
  • 63d0e2ad... TB 42891: Set the bundled search engine for Tor Browser.
    • toolkit/components/search/SearchService.sys.mjs: conflicts because of 1970d40f (maybe?). Anyway, the conflict is in code we remove, so not a big deal.
  • 0348b70f... TB 40002: [android] Ensure system download manager is not used
    • mobile/android/fenix/app/src/main/res/xml/preferences.xml: upstream removed android:defaultValue="false". Commit: 420eb15e. This needs audit --> #44072.
  • cf6ace40... TB 40009: [android] Change the default search engines
    • mobile/android/android-components/components/feature/search/src/main/assets/search/list.json: boo, upstream changed search engine configuration again. I accepted our version of the file.
  • cccb5765... [android] Modify add-on support
    • mobile/android/fenix/app/src/main/res/values/preference_keys.xml: need to append stuff at the end as usual
    • mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java: updatePrompt was refactored in c8b78554. This needs audit --> #44073.
  • a30c8c96... TB 40015: [android] Port padlock states for .onion services
    • mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_info.xml: toolbar icons were refactored in 3ed7b4e8. This needs audit --> #44074.
  • fa24b4de... [android] Modify Tracking Protection configuration
    • mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt: fdff0658 added bounceTrackingProtectionMode. This needs audit --> #44075.
  • b73a1034... [android] Rename as Tor Browser
    • mobile/android/fenix/app/build.gradle: upstream messed up with = again
  • d90015e4... [android] Override settings
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt: refactor around showTopSitesFeature and historyMetadataUIFeature. Not sure whether we want an issue for this. Also Mr2022Section.SYNC_CFR removed. I had to do this commit twice.
  • 05bcad46... TB 34403 [android]: Disable Normal mode by default.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt: getModeFromIntentOrLastKnown has been moved to mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/browsingmode/BrowsingModeManager.kt (more or less). 2af7989d. This needs audit --> #44071.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt: the button has gone, so I dropped also that part of the patch. See 8420027e --> #44071.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt: I don't really understand what happened around here. It's like some lines moved?
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt: had to re-indent.
  • 65a28102... [android] Modify UI/UX
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt: applyWallpaperTextColor() has gone.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt: conflicts with 1953740, which was a big refactor. Dropping changes for now.
    • mobile/android/fenix/app/src/main/res/layout/fragment_home.xml: there's a new ToggleButton.
    • mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt: the test was dropped, I think
  • 452e3abb... TB 40026 [android]: Implement Security Level settings on Android.
    • 95da358b... mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt: easy stuff, but I also moved the sec level setup as the last setup
  • [android] Delete unused media
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/PagerIndicator.kt: file deleted upstream
    • mobile/android/fenix/app/src/main/res/layout/fragment_history_search.xml: I had to restore this to fix a build error
  • a042a390... Various Android workarounds
    • mobile/android/android-components/components/service/sync-logins/src/main/java/mozilla/components/service/sync/logins/SyncableLoginsStorage.kt: conflicts because of 078bf80a: we now keep the output also of crypto.getOrGenerateKey(), and check if the key is new. We probably don't care of that, since we don't want logins. We can prob add to the existing audit issue (I think we have one? At least we have #43790)
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/Homepage.kt: I think the private browsing button has gone in 142. Opened #44071 as a meta issue
Edited by Pier Angelo Vendrame

Merge request reports

Loading