From 6512df79cf873198edd720d0aa45a2686bcf1073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Sun, 23 Mar 2025 13:08:40 +0100
Subject: [PATCH] Allow uBlock origin to be disabled in private browsing

---
 patches/allow-ubo-private-mode.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/patches/allow-ubo-private-mode.patch b/patches/allow-ubo-private-mode.patch
index 959a1cf..e1a3d16 100644
--- a/patches/allow-ubo-private-mode.patch
+++ b/patches/allow-ubo-private-mode.patch
@@ -1,20 +1,22 @@
-diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
-index 7281518..322dc09 100644
+diff --git a/toolkit/components/extensions/Extension.sys.mjs b/toolkit/components/extensions/Extension.sys.mjs
+index 8c7c14e60c..f19d705b20 100644
 --- a/toolkit/components/extensions/Extension.sys.mjs
 +++ b/toolkit/components/extensions/Extension.sys.mjs
-@@ -3286,6 +3286,16 @@ class Extension extends ExtensionData {
-       this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
+@@ -3989,6 +3989,18 @@
+       }
      }
  
 +    // We allow uBo in private mode.
 +    if (this.id === "uBlock0@raymondhill.net") {
-+      lazy.ExtensionPermissions.add(this.id, {
-+	permissions: [PRIVATE_ALLOWED_PERMISSION],
-+	origins: [],
++      lazy.ExtensionPermissions._has(this.id).then(has => {
++        if (has) return;
++        lazy.ExtensionPermissions.add(this.id, {
++          permissions: [PRIVATE_ALLOWED_PERMISSION],
++          origins: [],
 +        });
-+      this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
++        this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
++      });
 +    }
-+
 +
      // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during
      // install and upgrade/downgrade startups.