[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Lox integration

Title: GitLab

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • 7d601745
    by Pier Angelo Vendrame at 2024-09-05T20:03:33+02:00 
    fixup! Lox integration

Bug 42607 (part): Do not ship the Lox wasm blob on Android.
  • e56124b4
    by Pier Angelo Vendrame at 2024-09-05T20:03:40+02:00 
    fixup! Bug 40597: Implement TorSettings module

Bug 42607 (part): Do not try to enable Lox on Android.

Lox is not on Android, yet (not even in alpha), so we removed its WASM
blob to make x86 build fit the play store requirements.
However, this causes an error message in the console, which we do not
need to show because it is completely expected.

2 changed files:

Changes:

  • toolkit/components/lox/jar.mn
    1 1 
     toolkit.jar:
    2 
    +#ifndef ANDROID
    2 3 
         content/global/lox/lox_wasm_bg.wasm                      (content/lox_wasm_bg.wasm)
    4 
    +#endif

  • toolkit/modules/TorSettings.sys.mjs
    ... ... @@ -696,10 +696,12 @@ class TorSettingsImpl {
    696 696
    697 697 
         // Initialize this before loading from prefs because we need Lox initialized
    698 698 
         // before any calls to Lox.getBridges().
    699 
    -    try {
    700 
    -      await lazy.Lox.init();
    701 
    -    } catch (e) {
    702 
    -      lazy.logger.error("Could not initialize Lox.", e);
    699 
    +    if (!lazy.TorLauncherUtil.isAndroid) {
    700 
    +      try {
    701 
    +        await lazy.Lox.init();
    702 
    +      } catch (e) {
    703 
    +        lazy.logger.error("Could not initialize Lox.", e);
    704 
    +      }
    703 705 
         }
    704 706
    705 707 
         if (

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits