Issue 1712 - Don't add "Adblock Warning Removal List" subscription on Fennec

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 141 matching lines @@
         // Load subscriptions data
         let request = new XMLHttpRequest();
         request.mozBackgroundRequest = true;
         request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml");
         request.addEventListener("load", function()
         {
           if (onShutdown.done)
             return;
 
           let currentSubscription = FilterStorage.subscriptions.filter((subscription) => subscription instanceof DownloadableSubscription &&
-            subscription.url != Prefs.subscriptions_exceptionsurl);
+            subscription.url != Prefs.subscriptions_exceptionsurl && 
+            subscription.url != Prefs.subscriptions_antiadblockurl);
           currentSubscription = (currentSubscription.length ? currentSubscription[0] : null);
 
           let subscriptions =request.responseXML.getElementsByTagName("subscription");
           for (let i = 0; i < subscriptions.length; i++)
           {
             let item = subscriptions[i];
             let url = item.getAttribute("url");
             if (!url)
               continue;
 
@@ skipping 637 matching lines @@
         subscription.title = "Allow non-intrusive advertising";
         FilterStorage.addSubscription(subscription);
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
           Synchronizer.execute(subscription);
       }
       else
         addAcceptable = false;
     }
 
     // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions
-    if ((Services.vc.compare(prevVersion, "2.5") < 0) && !Utils.isFennec)

[Wladimir Palant, 2015/01/06 13:18:12]

I guess there is a misunderstanding here - not adding this list will break the
entire anti-adblock feature. We should keep adding it, but we shouldn't consider
it for the subscription selector. See lib/ui.js, function initCheckboxes(). When
currentSubscription is determined, we filter out the acceptable ads list - we
should filter out the anti-adblock list as well.

[saroyanm, 2015/01/06 16:03:07]

Thanks for pointing this out, but don't we also need to have a checkbox for it
in Fennec ?  Because by default it looks to be disabled, should I create
separate issue for that ?

[Wladimir Palant, 2015/01/06 17:05:21]

It is normally being enabled via the opt-in prompt. I'm not sure whether it was
ever implemented for Firefox Mobile, you can test it by navigating to
bouweenpc.nl for example.

[saroyanm, 2015/01/06 17:32:36]

The prompt is not showing up on mobile unfortunately,  anyway I think this can
be separate issue, I'll investigate that.

+    if (Services.vc.compare(prevVersion, "2.5") < 0)
     {
       let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
       if (subscription && !(subscription.url in FilterStorage.knownSubscriptions))
       {
         subscription.disabled = true;
         FilterStorage.addSubscription(subscription);
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
           Synchronizer.execute(subscription);
       }
     }
@@ skipping 1122 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });