Bug_42622: Remove duplicate onBootstrapStateChange

Merge Info

Related Issues

• #42622 (closed)

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
• Localization: typos and other localization changes that should be also in the release branch
• Other: please explain

Merging

• Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

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) : jwilde, 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 : jwilde, ma1
  • signing : boklm, richard
  • updater : pierov
  • windows : jwilde, richard
  • misc/other : pierov, richard

Change Description

Replacing firefox-android!118 (closed) since it wasn't merged before the monorepo migration with ESR 128. Also added a removal of a redundant semicolon (Kotlin doesn't need semicolons to indicate new lines)

Removed duplicated onBootstrapStateChange(TorConnectState.Error.state) so that it's only called once when an error occurs which should make it more consistent and easy to track whats going on.

How Tested

This MR shouldn't change user level app behavior, but notice that in the Logcat there is only one "onBootstrapStateChange(newStateVal = Error)" when an error occurs instead of 2. Easiest way to simulate an error right now is as follows

Bootstrap once to be able to go to about:config. Then you add a new integer preference called torbrowser.debug.censorship_level, which can have these values:

1. no censorship
2. it will ask you to provide a bridge
3. it will fail to detect a country, and will ask you to provide one
4. always fail

2, 3, and 4 should yield the same behavior currently.