Issue 5632 - Use checkboxes for toggling acceptable ads

desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 640 matching lines @@
         {
           setCustomFiltersView("read");
         });
         break;
       case "show-more-filters-section":
         E("more-filters").setAttribute("aria-hidden", false);
         break;
       case "switch-acceptable-ads":
         let value = element.value || element.dataset.value;
         // User check the checkbox
-        let isCheck = element.getAttribute("aria-checked") != "true";
-
+        let shouldCheck = element.getAttribute("aria-checked") != "true";
+        let installAcceptableAds = false;
+        let installAcceptableAdsPrivacy = false;
         // Acceptable Ads checkbox clicked
         if (value == "ads")
         {
-          browser.runtime.sendMessage({
-            type: isCheck ? "subscriptions.add" :
-              "subscriptions.remove",
-            url: acceptableAdsUrl
-          });
-          browser.runtime.sendMessage({
-            type: "subscriptions.remove",
-            url: acceptableAdsPrivacyUrl
-          });
-        }
-        else // Privacy Friendly Acceptable Ads checkbox clicked
-        {
-          browser.runtime.sendMessage({
-            type: isCheck ? "subscriptions.add" :
-              "subscriptions.remove",
-            url: acceptableAdsPrivacyUrl
-          });
-          browser.runtime.sendMessage({
-            type: isCheck ? "subscriptions.remove" :
-              "subscriptions.add",
-            url: acceptableAdsUrl
-          });
-        }
+          installAcceptableAds = shouldCheck;
+        }
+        // Privacy Friendly Acceptable Ads checkbox clicked
+        else
+        {
+          installAcceptableAdsPrivacy = shouldCheck;
+          installAcceptableAds = !shouldCheck;
+        }
+
+        browser.runtime.sendMessage({
+          type: installAcceptableAds ? "subscriptions.add" :
+            "subscriptions.remove",
+          url: acceptableAdsUrl
+        });
+        browser.runtime.sendMessage({
+          type: installAcceptableAdsPrivacy ? "subscriptions.add" :
+            "subscriptions.remove",
+          url: acceptableAdsPrivacyUrl
+        });
         break;
       case "switch-tab":
         switchTab(element.getAttribute("href").substr(1));
         break;
       case "toggle-disable-subscription":
         browser.runtime.sendMessage({
           type: "subscriptions.toggle",
           keepInstalled: true,
           url: findParentData(element, "access", false)
         });
@@ skipping 721 matching lines @@
   });
   browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }