Issue 3772 - Bring back anti-adblock warning removal subscription

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 167 matching lines @@
   }
 
   // Add "acceptable ads" subscription
   if (addAcceptable)
   {
     var subscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
     if (subscription)
     {
       subscription.title = "Allow non-intrusive advertising";
       FilterStorage.addSubscription(subscription);
-      if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+      if (subscription instanceof DownloadableSubscription &&
+          !subscription.lastDownload)
         Synchronizer.execute(subscription);
     }
     else
       addAcceptable = false;
   }
 
   // Add "anti-adblock messages" subscription for new users
   if (!prevVersion)
   {
     var 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)

[kzar, 2016/03/10 16:20:24]

Nit: Mind wrapping this long line?

[Sebastian Noack, 2016/03/11 15:41:01]

Done.

+      if (subscription instanceof DownloadableSubscription &&
+          !subscription.lastDownload)
         Synchronizer.execute(subscription);
     }
   }
 
   if (!addSubscription && !addAcceptable)
     return;
 
   Promise.resolve(addSubscription && fetch("subscriptions.xml")
     .then(function(response)
     {
@@ skipping 225 matching lines @@
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "blockelement-finished"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });