ma1 pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project /
Applications / Tor Browser
Commits:
0a2d22e5 by hackademix at 2025-10-21T10:33:41+02:00
fixup! [android] Modify add-on support
BB 44133: Hide (again) the "Allow in private browsing" checkboxes from
WebExtension management UI when in global PBM
- - - - -
4 changed files:
-
mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
-
mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt
-
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt
-
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/PermissionsDialogFragment.kt
Changes:
=====================================
mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
=====================================
@@ -379,6 +379,7 @@ class GeckoWebExtension(
temporary = it.temporary,
detailUrl = it.amoListingUrl,
incognito = Incognito.fromString(it.incognito),
+ defaultPrivateBrowsingAllowed = it.allowedInPrivateBrowsing,
)
}
}
=====================================
mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt
=====================================
@@ -508,6 +508,11 @@ data class Metadata(
*
https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/incognito
*/
val incognito: Incognito,
+
+ /**
+ * Wether this extension should default to pbm-allowed because being
installed in global PBM
+ */
+ val defaultPrivateBrowsingAllowed : Boolean = false,
)
/**
=====================================
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt
=====================================
@@ -52,6 +52,7 @@ val logger = Logger("Addon")
* @property ratingUrl The link to the ratings page (user reviews) for this
[Addon].
* @property detailUrl The link to the detail page for this [Addon].
* @property incognito Indicates how the extension works with private browsing
windows.
+ * @property defaultPrivateBrowsingAllowed whether the extension should
default to pbm-enabled.
*/
@SuppressLint("ParcelCreator")
@Parcelize
@@ -77,6 +78,7 @@ data class Addon(
val ratingUrl: String = "",
val detailUrl: String = "",
val incognito: Incognito = Incognito.SPANNING,
+ val defaultPrivateBrowsingAllowed: Boolean = false,
) : Parcelable {
/**
@@ -489,6 +491,7 @@ data class Addon(
detailUrl = detailUrl,
incognito = incognito,
installedState = installedState,
+ defaultPrivateBrowsingAllowed =
metadata?.defaultPrivateBrowsingAllowed == true,
)
}
=====================================
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/PermissionsDialogFragment.kt
=====================================
@@ -270,6 +270,9 @@ class PermissionsDialogFragment : AddonDialogFragment() {
forOptionalPermissions
) {
allowedInPrivateBrowsing.isVisible = false
+ } else {
+ allowedInPrivateBrowsing.isChecked =
addon.defaultPrivateBrowsingAllowed
+ allowedInPrivateBrowsing.isVisible =
!addon.defaultPrivateBrowsingAllowed
}
positiveButton.setOnClickListener {
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a2d22e5f8502d393888104f9a68f88dfb523459
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a2d22e5f8502d393888104f9a68f88dfb523459
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
