Issue 6783 - opt-in to anti circumvention filter list on upgrade

lib/subscriptionInit.js

Index: lib/subscriptionInit.js
===================================================================
--- a/lib/subscriptionInit.js
+++ b/lib/subscriptionInit.js
@@ -206,17 +206,18 @@
         Prefs.subscriptions_antiadblockurl
       );
       antiAdblockSubscription.disabled = true;
       subscriptions.push(antiAdblockSubscription);
     }
   }
 
   // Add default ad blocking subscription (e.g. EasyList)
-  if (shouldAddDefaultSubscription())
+  // Ensure the Anti Circumvention is added on upgrade.
+  if (shouldAddDefaultSubscription() || !Prefs.subscriptions_checkedanticv)

[Manish Jethani, 2018/07/12 07:54:27]

But this will add an "ads" list as well. Shouldn't there be an additional check
somewhere to add only the "circumvention" list?

[kzar, 2018/07/12 10:07:59]

Yea, this logic doesn't look right.

Perhaps split out a function to add and enable default subscriptions, then just
hardcode the part that adds the anti-circumvention subscription if the
preference is falsey.

[hub, 2018/07/12 17:14:09]

This came to my mind before falling asleep. I'll fix it.

   {
     return fetch("subscriptions.xml")
       .then(response => response.text())
       .then(text =>
       {
         let doc = new DOMParser().parseFromString(text, "application/xml");
         let nodes = doc.getElementsByTagName("subscription");
 
@@ -233,16 +234,18 @@
             if (url)
             {
               let subscription = Subscription.fromURL(url);
               subscription.disabled = false;
               subscription.title = node.getAttribute("title");
               subscription.homepage = node.getAttribute("homepage");
               subscription.type = node.getAttribute("type");
               subscriptions.push(subscription);
+              if (subscription.type == "circumvention")
+                Prefs.subscriptions_checkedanticv = true;
             }
           }
         }
 
         return subscriptions;
       });
   }