Skip to content

Review Mozilla 1914244: Update GeckoView:WebExtension:Install support the enable in private mode flag

🔍 Bugzilla Audit

Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1914244

Description

Conflicted during rebases in mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs.

181:  011324b77e3d0 ! 185:  dd7b0ee1296f7 [android] Modify add-on support
[...]
      ## mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs ##
     @@ mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs: async function exportExtension(aAddon, aSourceURI) {
    -     disabledFlags.push("appVersionDisabled");
    +     privateBrowsingAllowed = policy.privateBrowsingAllowed;
    +   } else {
    +     const { permissions } = await lazy.ExtensionPermissions.get(aAddon.id);
    +-    privateBrowsingAllowed = permissions.includes(PRIVATE_BROWSING_PERM_NAME);
    ++    privateBrowsingAllowed =
    ++      permissions.includes(PRIVATE_BROWSING_PERM_NAME) ||
    ++      lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;
        }
    -   const baseURL = policy ? policy.getURL() : "";
    --  const privateBrowsingAllowed = policy ? policy.privateBrowsingAllowed : false;
    -+  const privateBrowsingAllowed = policy
    -+    ? policy.privateBrowsingAllowed
    -+    : lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;

Also, it dropped @+id/allow_in_private_browsing from mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml.


Edited by Pier Angelo Vendrame
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information