fenix merge requestshttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests2022-12-02T12:14:57Zhttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/160Bug 41465: port yec22 home fragment, theming, and timegate toggle to 1022022-12-02T12:14:57ZDan BallardBug 41465: port yec22 home fragment, theming, and timegate toggle to 102thankfully the cherry pick was very easy as fenix is on 102 for tor-browser 11 and 12thankfully the cherry pick was very easy as fenix is on 102 for tor-browser 11 and 12Dan BallardDan Ballardhttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/150fixup! Modify Add-on support (fixes fenix#40255)2023-12-30T09:48:27Zma1fixup! Modify Add-on support (fixes fenix#40255)- This fixup registers NoScript for automatic updates (a step missing from the original commit) on first install and on every startup, since if it had already been installed by a previous Tor Browser version it wouldn't get any update ot...- This fixup registers NoScript for automatic updates (a step missing from the original commit) on first install and on every startup, since if it had already been installed by a previous Tor Browser version it wouldn't get any update otherwise (if it's already registered this a NOP).
- We also try to upgrade NoScript to latest available stable version on first browser installation.
- References to the `addonManager` and `addonUpdater` components are deferred to `onTorConnect()` in order to prevent premature instantiation and network activity attempts, which would fail.
- Additionally we temporarily drop and restore the current thread policy while copying the XPI to cacheDir, because disk writing caused a crash on startup.
fixes https://gitlab.torproject.org/tpo/applications/fenix/-/issues/40225ma1ma1https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/146Bug 40218: Rebased Fenix patches to v100.0.0-beta7 for TBA 11.52022-07-11T09:50:08ZPier Angelo VendrameBug 40218: Rebased Fenix patches to v100.0.0-beta7 for TBA 11.5The major changes were the introduction of HTTPS Only mode in TBA (we should enable it by default!), and Moz moved the descriptions for the private mode.
Please see my comments on #40218 for all my notes about the rebase.
Last note abo...The major changes were the introduction of HTTPS Only mode in TBA (we should enable it by default!), and Moz moved the descriptions for the private mode.
Please see my comments on #40218 for all my notes about the rebase.
Last note about the telemetry fix: I preferred keeping the v99 one, and we'll revert and add a fixup when a better fix will be ready.Pier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/145Bug 40217: Rebased to v99.2.02022-07-11T09:50:27ZPier Angelo VendrameBug 40217: Rebased to v99.2.0As I wrote on #40217, TBA 11.0 and 11.5 have the same patch sets (at least for the moment, and at least from v94).
Therefore, this has been rebased from 11.5, rather than v96 11.0.As I wrote on #40217, TBA 11.0 and 11.5 have the same patch sets (at least for the moment, and at least from v94).
Therefore, this has been rebased from 11.5, rather than v96 11.0.Pier Angelo VendramePier Angelo Vendramehttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/142Draft: Resolve Bug 40205: Rebased Fenix patches to 96.2.02022-04-21T14:36:42ZaguestuserDraft: Resolve Bug 40205: Rebased Fenix patches to 96.2.0# context
- resolves #40205
- marked draft pending resolution of toolchain dependencies in #40418
# notes
here is a thread for a running list of non-obvious decisions made about resolving conflicts as breadcrumb for review later... (m...# context
- resolves #40205
- marked draft pending resolution of toolchain dependencies in #40418
# notes
here is a thread for a running list of non-obvious decisions made about resolving conflicts as breadcrumb for review later... (mostly a list of changes i accepted from upstream Moz v96.2.0 branch that i want to make sure are safe!)
- when applying `apply ffe02b33f... Add Tor integration and UI`:
- in `Components.kt`:
- line 181: accept `val appStore by lazyMonitored { AppStore() }`
- in `HomeActivity.kt:`:
- line 192: allow `MarkersFragmentLifecycleCallbacks.register(supportFragmentManager, components.core.engine)` (not present in our patch set)
- in `HomeFragment.kt`:
- accepted moz class rename infrom `HistoryMetadataFeature` to `RecentVisitsFeature` (lines 186, 337)
```kotlin
// line 186
private val historyMetadataFeature = ViewBoundFeatureWrapper<RecentVisitsFeature>()
// line 337
feature = RecentVisitsFeature(
```
- accepted instances of moz lifecycle profiling (lines 213, 225, 420)
```kotlin
// line 213
requireComponents.core.engine.profiler?.addMarker(
MarkersFragmentLifecycleCallbacks.MARKER_NAME, profilerStartTime, "HomeFragment.onCreate",
)
// line 225
val profilerStartTime = requireComponents.core.engine.profiler?.getProfilerTime()
// line 420
requireComponents.core.engine.profiler?.addMarker(
MarkersFragmentLifecycleCallbacks.MARKER_NAME, profilerStartTime, "HomeFragment.onCreateView",
)
```
- accepted moz passing metrics reporting flag to session controller (line 464):
`sessionControlView?.update(it, shouldReportMetrics = true)`
- in `Mode.kt`:
- accepted mozilla's elimination of `SharableAccount`
- in `SessionControlAdapter`: nothing interesting
- in `SessionControlController`:
- accepted calls to `reportSessionMetrics` (lines 208, 667)
```kotlin
// line 208
/**
* @see [SessionControlInteractor.reportSessionMetrics]
*/
fun handleReportSessionMetrics(state: HomeFragmentState)
// line 667
override fun handleReportSessionMetrics(state: HomeFragmentState) {
with(metrics) {
track(
if (state.recentTabs.isEmpty()) Event.RecentTabsSectionIsNotVisible
else Event.RecentTabsSectionIsVisible
)
track(Event.RecentBookmarkCount(state.recentBookmarks.size))
}
}
```
- accepted elimination of `handleSwipedItemDeletionCancel` (formerly line 258)
- in `SessionControllerInteractor`:
- accept `reportSessionMetrics` implementation (line 487)
- in `styles.xml`:
- accepted moz rename of `SubtitleTextStyle` -> `Subtitle12TextStyle` (line 459)
- accepted moz elimination of `SearchEngineShortcutsLabelStyle` (line 539)
- when applying `2be3f44e5 Modify UI/UX`:
- in `BaseBrowserFragment`:
- accept elimination of call to `updateThemeForSession(it)` if `components.core.store.state.findTabOrCustomTabOrSelectedTab(customTabSessionId)` is non-null.
- NOTE: potentially controversial because we used to force loading a private mode home screen instead of calling `updateThemeForSession`. however, since the check that used to trigger this call has been eliminated, it is likely safe. this is what we used to do (and will no longer have an opportunity to need to do):
```kotlin
components.core.store.state.findTabOrCustomTabOrSelectedTab(customTabSessionId)?.let {
// If the most-recent session was a tab in Normal mode, and now Normal mode is disabled,
// then load the Private Mode home screen, instead.
if (!it.content.private && requireContext().settings().shouldDisableNormalMode) {
findNavController().nav(
R.id.browserFragment,
BrowserFragmentDirections.actionGlobalHomeFragment()
)
}
updateThemeForSession(it)
}
```
- in `preference_keys.xml`:
- accepted elimination of `<string name="pref_key_feedback" translatable="false">pref_key_feedback</string>` (formerly line 44)
- in `TabLayoutMediator`:
- accept `tabPager.setCurrentItem(position, false)` in call to `TabLayoutMediator::selectTabAtPosition` (line 69)aguestuseraguestuserhttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/138Rebase 10.5 patches onto 91.2.02021-10-27T16:13:00ZMatthew FinkelRebase 10.5 patches onto 91.2.0Closes #40188Closes #40188https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/133Draft: Rebase Fenix 11.0 patches to Fenix 91 beta 42021-07-29T09:01:41ZboklmDraft: Rebase Fenix 11.0 patches to Fenix 91 beta 4Closes #40184.Closes #40184.boklmboklmhttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/132Draft: Bug 40135: Adaptive icons2021-10-06T20:07:55ZHackerNCoderhackerncoder@encryptionin.spaceDraft: Bug 40135: Adaptive iconscloses #40135closes #40135https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/131Bug 40181: Remove V2 deprecation banner2021-07-21T01:45:10ZHackerNCoderhackerncoder@encryptionin.spaceBug 40181: Remove V2 deprecation bannercloses #40181closes #40181https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/130squash! Add Tor integration and UI2021-12-13T22:22:04ZMatthew Finkelsquash! Add Tor integration and UIBug 40176: Re-render Home fragment on resume
Closes #40176Bug 40176: Re-render Home fragment on resume
Closes #40176https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/128Draft: Possibly add Tor Browser bookmarks on user onboard2021-07-16T22:39:32ZHackerNCoderhackerncoder@encryptionin.spaceDraft: Possibly add Tor Browser bookmarks on user onboardNot the best way to do it. But hopefully it will workNot the best way to do it. But hopefully it will workhttps://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/127Draft: Possibly remove new-tab on long-press2021-07-16T22:39:47ZHackerNCoderhackerncoder@encryptionin.spaceDraft: Possibly remove new-tab on long-pressCloses #40174Closes #40174https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/119Draft: Bugs #40166 and #401672021-07-08T17:46:11ZMatthew FinkelDraft: Bugs #40166 and #40167Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray
Bug 40167: Hide "Save to Collection" in menu
Closes #40166 #40167Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray
Bug 40167: Hide "Save to Collection" in menu
Closes #40166 #40167https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/116Draft: Bug 40165: Announce v2 onion service deprecation on about:tor2021-05-25T22:09:32ZMatthew FinkelDraft: Bug 40165: Announce v2 onion service deprecation on about:torCloses #40165Closes #40165https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/115Draft: Rebase fenix patches to fenix v89.0.0-beta.52021-05-25T22:17:21ZMatthew FinkelDraft: Rebase fenix patches to fenix v89.0.0-beta.5Closes #40164
The range-diff is messy. @boklm resolved all of the conflicts up to boklm/fenix@f3c35ff3673554556cf13d692844aa41254bb240.
- I tweaked the `Add Tor integration` patch due to 990bfa7e6dd5894d61473a41da6129e6947974e2. (fix...Closes #40164
The range-diff is messy. @boklm resolved all of the conflicts up to boklm/fenix@f3c35ff3673554556cf13d692844aa41254bb240.
- I tweaked the `Add Tor integration` patch due to 990bfa7e6dd5894d61473a41da6129e6947974e2. (fixup is sysrqb/fenix@5028b32d95e66ec9fd42ac5160efa324a0698720)
- The `Modify UI/UX` patch diff is complicated because Mozilla re-ordered menu items.
- Mozilla added `getSetDefaultBrowserItem`, but that is controlled by a Nimbus experiment so there isn't any impact on Tor Browser.
- They added an `allow_domestic_china_fxa_server` preference. It is hidden when the user is not signed into Sync, but I changed the default visibility in any case.
- In `preferences.xml` and `preferences_without_icons.xml` I made small changes to follow the existing style (space before `/>` in xml)https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/106Draft: Bug 40150 012021-03-16T02:17:12ZMatthew FinkelDraft: Bug 40150 01Closes #40150Closes #40150https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/105Bug 40150 002021-03-16T02:17:02ZMatthew FinkelBug 40150 00Closes #40150Closes #40150Tor Browser: 10.0https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/102Draft: squash! Modify UI/UX2021-02-17T23:43:13ZMatthew FinkelDraft: squash! Modify UI/UXBug 40144: Hide Download Manager
Closes #40144Bug 40144: Hide Download Manager
Closes #40144Tor Browser: 10.0https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/98Draft: squash! Modify build system2021-02-04T16:55:36ZMatthew FinkelDraft: squash! Modify build systemBug 40143: Use deterministic date in Test apk
The build config was using Date() when generating the Test apk's
versionName.Bug 40143: Use deterministic date in Test apk
The build config was using Date() when generating the Test apk's
versionName.Tor Browser: 10.5https://gitlab.torproject.org/tpo/applications/fenix/-/merge_requests/97squash! Modify UI/UX2021-02-11T17:43:11ZMatthew Finkelsquash! Modify UI/UXBug 40144: Hide Download Manager
Closes #40144Bug 40144: Hide Download Manager
Closes #40144Tor Browser: 10.0