Skip to content

Bug 33594 08 80.0b6

Matthew Finkel requested to merge sysrqb/fenix:bug_33594_08_80.0b6 into tor-browser-80.0b6-10-1

Follow up from !2 (closed)

This is the first set of Fenix patches

In 84e773c1e8f44ccf85ecc1df7e3889eeb573e0ce we change the applicationId (it must be different from all other apps). We use org.torproject as the base name. Specifically:

  • org.mozilla.fenix -> org.torproject.torbrowser_dev
    • Mapping to the default buildtype (but it's not actually a buildable buildtype)
  • org.mozilla.fenix -> org.torproject.torbrowser_nightly
    • Mapping to buildtype fenixProduction
  • org.mozilla.fenix.debug -> org.torproject.torbrowser_debug
    • Mapping to buildtype debug
  • org.mozilla.fenix.performancetest -> org.torproject.torbrowser_debug.performancetest
    • Mapping to buildtype forPerformanceTest
  • org.mozilla.firefox_beta -> org.torproject.torbrowser_alpha
    • Mapping to buildtype fennecBeta
  • org.mozilla.firefox -> org.torproject.torbrowser
    • Mapping to buildtype fennecProduction

I doubt we'll use forPerformanceTest in the near future, but I'm including it for completeness. When we move to FF81:

  • fenixProduction becomes nightly
  • fennecBeta becomes beta
  • fennecProduction becomes release

In e31988c24e44e013f2059f6c12902ca2f678f083 we change the (branding) app name. Specifically:

  • Firefox Preview -> Tor Browser Dev (This is the default name)
    • currently mapping to either of:
      • org.torproject.torbrowser_debug
      • org.torproject.torbrowser_debug.performancetest
  • Firefox Nightly -> Tor Browser Nightly
    • mapping to org.torproject.torbrowser_nightly
  • Firefox Beta -> Tor Browser Alpha
    • mapping to org.torproject.torbrowser_alpha
  • Firefox -> Tor Browser
    • mapping to org.torproject.torbrowser

In 905103d35592105d9bfc683d4d15009cd227ecd7 we change the deepLink scheme. This is distinct from #40021 (moved) where we may limit its use. This change reduces the scope of internal links (where an internal link opened in Tor Browser won't accidently be opened in Firefox).

In b631560f14d7c700df354ecae0a55f23df353366 we define a new compile-time constant for DATA_COLLECTION_DISABLED. This constant is used in the code for setting the default value of telemetry being enabled/disabled. I am hoping this patch is a reasonable starting place for uplifting.

In 4fe29259bc419c31dd3dc7855839fa412946f1a4 we avoid throwing the IllegalStateException exception when we are in a Release and DATA_COLLECTION_DISABLED is true (so that exception is thrown only when data collection is enabled).

In 3b15cf66dd68c0f3a97bf76372428aba823fbf5a we change the default crash reporter state from "always enabled" to "only enabled if DATA_COLLECTION_DISABLED is false".

In aa9cccbf9b30a067baec62a06c4d24a8daea0434 we rip out the Google Advertising ID support. Adding the @Suppress("UNUSED_PARAMETER") annotation is important because the compiler errors when a method's signature contains an unused parameter.

In ee653b70c7c927266c8cea1c3d1e88a2a469ee77 we simply disable the background service, for defense-in-depth.

Closes #40020 (closed) #33594 (closed) #40019 (closed) android-components#34338 (closed) #40014 (closed) #40018 (closed)

Edited by Matthew Finkel

Merge request reports