issue #690 - don't consider special subscriptions when complaining about high subscription count

chrome/content/ui/sendReport.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 734 matching lines @@
   collectData: function(wnd, windowURI, callback)
   {
     this.contentWnd = wnd;
     let now = Date.now() / MILLISECONDS_IN_SECOND;
     let outdatedThreshold = now - 14 * SECONDS_IN_DAY;
     let needUpdateThreshold = now - 1 * SECONDS_IN_HOUR;
 
     this.outdated = [];
     this.needUpdate = [];
 
-    let subscriptions = FilterStorage.subscriptions.filter(subscriptionUpdateDataSource.subscriptionFilter);

[Wladimir Palant, 2014/07/30 05:44:35]

this.subscriptionFilter please.

[saroyanm, 2014/07/30 06:11:58]

Oops.

+    let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
     for (let i = 0; i < subscriptions.length; i++)
     {
       let lastSuccess = subscriptions[i].lastSuccess;
       if (lastSuccess < outdatedThreshold)
         this.outdated.push(subscriptions[i]);
       if (lastSuccess < needUpdateThreshold)
         this.needUpdate.push(subscriptions[i]);
     }
 
     callback();
@@ skipping 119 matching lines @@
   isEnabled: Prefs.enabled,
   whitelistFilter: null,
   disabledFilters: [],
   disabledSubscriptions: [],
   ownFilters: [],
   numSubscriptions: 0,
   numAppliedFilters: Infinity,
 
   subscriptionFilter: function(s)
   {
-    if (s instanceof DownloadableSubscription && s.url != Prefs.subscriptions_exceptionsurl
-        && s.url != Prefs.subscriptions_antiadblockurl)

[Wladimir Palant, 2014/07/30 05:44:35]

Please try to keep the lines shorter than 80 characters. In this particular case
it means having each part of the condition on a separate line. Also, we
typically leave the operator (&& here) before the line break. Finally, please
add brackets around the body of the if statement here, otherwise with multiline
conditions it's not immediately obvious where the body starts.

[saroyanm, 2014/07/30 06:11:58]

Thanks, done.

+    if (s instanceof DownloadableSubscription &&
+        s.url != Prefs.subscriptions_exceptionsurl &&
+        s.url != Prefs.subscriptions_antiadblockurl)
+    {
       return subscriptionsDataSource.subscriptionFilter(s);
+    }
     else
       return false;
   },
 
   collectData: function(wnd, windowURI, callback)
   {
     this.contentWnd = wnd;
     this.whitelistFilter = Policy.isWindowWhitelisted(wnd);
 
     if (!this.whitelistFilter && this.isEnabled)
@@ skipping 663 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }