Skip to content

Bug_41188: Screen refactor + add remaining screens

clairehurst requested to merge clairehurst/firefox-android:bug_41188-screen-refactor into firefox-android-115.2.1-13.5-1

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macos : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

Refactored Connection Assist screens to be DRY-er (Don't Repeat Yourself) and hopefully easier to work with. Additional screens were also added but only the "Internet Error" screen is currently accessible as a catch all for any TorError. To see other screens, change the line _torConnectScreen.value = ConnectAssistUiState.InternetError under handleError() in TorConnectionAssistViewModel to the screen of your choosing, though they have limited functionality (main reason for not including them yet).

How Tested

Make sure everything works as normal. Try bootstrapping, canceling, autobootstrapping, etc. Turning off internet does not trigger any UI changes (yet) and it will stay in "Bootstrapping" forever

Edited by clairehurst

Merge request reports