Handle disabled state of AA

js/desktop-options.js

Index: js/desktop-options.js
===================================================================
--- a/js/desktop-options.js
+++ b/js/desktop-options.js
@@ -234,17 +234,17 @@
     if (this.details[i].searchable)
       element.setAttribute("data-search", title.toLowerCase());
     let controls = element.querySelectorAll(".control[role='checkbox']");
     for (let control of controls)
     {
       control.setAttribute("aria-checked", item.disabled == false);
       if (isAcceptableAds(item.url) && this == collections.filterLists)
       {
-        control.disabled = true;
+        element.classList.add("acceptable-ads");
       }
     }
     if (additionalSubscriptions.includes(item.url))
     {
       element.classList.add("preconfigured");
       let disablePreconfigures =
         element.querySelectorAll("[data-disable~='preconfigured']");
       for (let disablePreconfigure of disablePreconfigures)
@@ -1074,22 +1074,23 @@
 {
   let acceptableAdsForm = E("acceptable-ads");
   let acceptableAds = E("acceptable-ads-allow");
   let acceptableAdsPrivacy = E("acceptable-ads-privacy-allow");
   acceptableAdsForm.classList.remove("show-dnt-notification");
   acceptableAds.setAttribute("aria-checked", false);
   acceptableAdsPrivacy.setAttribute("aria-checked", false);
   acceptableAdsPrivacy.setAttribute("tabindex", 0);
-  if (acceptableAdsUrl in subscriptionsMap)
+  if (acceptableAdsUrl in subscriptionsMap && !acceptableAdsUrl.disabled)
   {
     acceptableAds.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-disabled", false);
   }
-  else if (acceptableAdsPrivacyUrl in subscriptionsMap)
+  else if (acceptableAdsPrivacyUrl in subscriptionsMap &&
+    !acceptableAdsPrivacyUrl.disabled)
   {
     acceptableAds.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-disabled", false);
 
     // Edge uses window instead of navigator.
     // Prefer navigator first since it's the standard.
     if ((navigator.doNotTrack || window.doNotTrack) != 1)