Skip to content

Bug 43099: 2024 YEC 13.5 backport

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

Changes should be almost the exact same as tor-browser!1227 (merged) with a few minor tweaks

- Downloaded jtorctl-0.2.jar from https://people.torproject.org/~dan/jtorctrl/ and added it to this MR
- Added `implementation files('jtorctl-0.2.jar')` to build.gradle
- Changed YecStyle.entries to YecStyle.values() on HomeFragment.kt:1370 (kotlin version difference)
- Changed draw behind top left offset from 2.dp to 4.dp on HomeFragment.kt:1276 (text displays differently for some reason and this makes the "highlighted" text look better)

image image image

image image image

How Tested

To get this building, I had to...

  • Change NDK to 23 instead of 26 in android-env.sh and local.properties
  • Download jtorctl-0.2.jar from https://people.torproject.org/~dan/jtorctrl/ and add implementation files('jtorctl-0.2.jar') to build.gradle (this change is currently in this MR, but I'm not totally sure if we want it?)

After that, should be the same as tor-browser!1227 (merged)

Edited by ma1

Merge request reports