Rebase 148 build-1 cherry pick MR review

Dan Ballardrequested to merge
dan/tor-browser:tor-browser-148.0a1-16.0-1 into tor-browser-148.0a1-16.0-1

Just the git cherry-pick FIREFOX_NIGHTLY_147_END..tor-browser-147.0a1-16.0-2-build1

all conflict notes

  • BB 43564: Modify ./mach bootstrap for Base Browser

  • Tweaks to the build system

    • mach.txt
      • pypi-optional:glean-sdk version bump that we comment out

  • BB 24796: Comment out excess permissions from GeckoView

    • mobile/android/moz.configure
      • moz added more flags at EOF where we added more flags

  • BB 44045: Disable ML features

    • toolkit/modules/ActorManagerParent.sys.mjs
      • moz added ColorPicker right after our AboutTranslationsParent deletion and comment so merge confused

  • BB 31740: Remove some unnecessary RemoteSettings instances

    • services/settings/dumps/main/moz.build
      • they'd deleted a few lines in our bigger delete

  • BB 26345: Hide tracking protection UI

    • browser/components/preferences/privacy.inc.xhtml
      • both commits edited a same line adding a field

  • BB 42777: Hide Website Privacy Preferences.

    • browser/components/preferences/privacy.inc.xhtml
      • both commits edited a same line adding a field

  • BB 43850: Modify the Contrast Control settings for RFP

  • BB 41369: Improve Firefox language settings for multi-lingual packages

    • browser/base/content/browser-main.js: we both added import lines, put ours first

  • BB 31575: Disable Firefox Home (Activity Stream)

    • browser/components/moz.build
      • added "multilineeditor" above where we deleted "newtab"

  • BB 4234: Use the Firefox Update Process for Base Browser.

    • toolkit/mozapps/extensions/AddonManager.sys.mjs
      • swapped MOZ_COMPATIBILITY_NIGHTLY for AppConstants.NIGHTLY_BUILD just below code added by us

  • BB 42061: Create an alpha update channel.

    • toolkit/mozapps/extensions/test/xpcshell/head_addons.js
      • we added "alpha" to now deleted isNightlyChannel()

  • BB 40926: Implemented the New Identity feature

    • browser/components/moz.build
      • our add of "newidentity" and their add of multilineeditor

  • TB 43564: Modify ./mach bootstrap for Tor Browser

    • python/mozboot/mozboot/bootstrap.py
      • same as "BB 43564: Modify ./mach bootstrap for Base Browser", indentation change

  • TB 41089: Add tor-browser build scripts + Makefile to tor-browser

    • .gitignore
      • moz added .claude and .json.gz colliding with out adding .binaries

  • TB 43107: Disable remoting by default

    • toolkit/xre/nsAppRunner.cpp
      • moz changed the lines above to (MOZ_CONSTINIT to constinit), unrealted to us

  • TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop

    • toolkit/modules/moz.build
      • moz added their own "MOZ_SRC_FILES += ["" with 3 files where we added it with "DragDropFilter.sys"

  • TB 30237: Add v3 onion services client authentication prompt

    • browser/components/preferences/privacy.inc.xhtml
      • collision on changes around
      • TODO: authPreferences.inc.xhtml probably needs modernizing to what ever <html:setting-group is
    • toolkit/content/aboutNetError.html
      • collision on adding new .ftl files

  • TB 40458: Implement .tor.onion aliases

    • browser/components/BrowserComponents.manifest
      • collision in line above our change updated

  • [android] Modify add-on support

    • mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
      • verifyUrl() call changed to val redirectURL = SupportUtils.WHATS_NEW_URL.toUri() verifyUrl(redirectURL.authority?.removePrefix("www.") + redirectURL.encodedPath) - [ ] bea confirm our simple one is still fine?
    • mobile/android/fenix/app/src/main/res/values/preference_keys.xml
      • collision both adding at same spot

  • [android] Disable features and functionality

    • mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/middleware/SearchMiddleware.kt
      • value we null changed
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
      • initializeGlean -> maybeInitializeGlean and minor changes around our exit if telem is not enabled
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
      • moz changed code we noop
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
      • moz deleted featureflagx3, one switch from default to defaultValue

  • [android] Rename as Tor Browser

    • mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values/dimens.xml
      • doesn't seem to be in this MR? took theirs

<<<<<<< HEAD:mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values/dimens.xml
<resources>
    <dimen name="mozac_minimal_display_toolbar_height">32dp</dimen>
</resources>
=======
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item
        android:drawable="@drawable/ic_launcher_foreground"
        android:width="192dp"
        android:height="192dp"
        android:gravity="center" />
</layer-list>
>>>>>>> a40b223797145 ([android] Rename as Tor Browser):mobile/android/fenix/app/src/main/res/drawable/splash_screen.xml

  • [android] Rename as Tor Browser (continued)

  • [android] Override settings

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
      • deleted featureFlag x 5 , value to defaultValue x 2
      • shouldShowOnboarding changed so much our attempt to preserve some structure didnt seem worth it, now just "return false"

  • TB 34403 [android]: Disable Normal mode by default

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/search/ApplicationSearchMiddleware.kt
      • context: MiddlewareContext<BrowserState, BrowserAction>,
        • TB changes to middlewareContext: MiddlewareContext<BrowserState, BrowserAction>,
        • moz changes to store: Store<BrowserState, BrowserAction>,
      • below they change loadSearchEngines(context.store) to store and we change to middlewareContext.store
      • so using that in both places and hoping it works
        • TODO confirm

  • [android] Modify UI/UX

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
      • PRIVATE_NOTICE to PRIVACY_NOTICE in commented out section

  • TB 44027 [android]: Update PBM lockscreen

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
      • featureFlag was dropped

  • TB 40041 [android]: Implement Tor Network Settings

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
      • both adding new pref

  • [android] Delete unused media

    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/experiments/view/ResearchSurfaceSurvey.kt
      • some change around our delete
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyCompleted.kt
      • changed import by our add
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/
      • changed the drawlable we replace
    • mobile/android/fenix/app/src/main/res/xml/preferences.xml
      • changed the drawlable we replace

  • TB 42669: [android] Use custom no-op app-services

    • mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
      • changing our verision and channel
Edited by Dan Ballard

Merge request reports