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

chrome/content/ui/sendReport.js

Index: chrome/content/ui/sendReport.js
===================================================================
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -879,7 +879,7 @@
   disabledFilters: [],
   disabledSubscriptions: [],
   ownFilters: [],
-  numSubscriptions: 0,
+  numGeneralSubscriptions: 0,

[Wladimir Palant, 2014/07/28 09:17:18]

I see no point renaming this property, your new name doesn't explain any more
than the old one did.

[saroyanm, 2014/07/28 09:49:20]

Done.

   numAppliedFilters: Infinity,
 
   subscriptionFilter: function(s)
@@ -949,8 +949,11 @@
           }
         }
       }
+      
+      for each (let {url} in FilterStorage.subscriptions.filter(this.subscriptionFilter))

[saroyanm, 2014/07/26 19:52:07]

Not sure if we need separate generalSubscriptionFilter, for not to iterate, but
I guess we can be okey with this solution.

[Wladimir Palant, 2014/07/28 09:17:18]

Please simply extend subscriptionFilter - this function is only used in
issuesDataSource and nowhere else. Note that it is already different from
subscriptionsDataSource.subscriptionFilter because the requirements are
different here.

[saroyanm, 2014/07/28 09:49:20]

Seams like the issuesDataSource.subscriptionFilter also used by
subscriptionUpdateDataSource, so I've created
subscriptionUpdateDataSource.subscriptionFilter, to also check whether all
subscripptions updated or not, including "Anti adblock notifications" and
"whitelist".

+        if (url != Prefs.subscriptions_exceptionsurl && url != Prefs.subscriptions_antiadblockurl)
+          this.numGeneralSubscriptions++;
 
-      this.numSubscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter).length;
       this.numAppliedFilters = 0;
       for each (let filter in filtersDataSource.origFilters)
       {
@@ -977,8 +980,8 @@
     E("issuesWhitelistBox").hidden = !this.whitelistFilter;
     E("issuesDisabledBox").hidden = this.isEnabled;
     E("issuesNoFiltersBox").hidden = (type != "false positive" || this.numAppliedFilters > 0);
-    E("issuesNoSubscriptionsBox").hidden = (type != "false negative" || this.numAppliedFilters > 0 || this.numSubscriptions > 0);
-    E("issuesSubscriptionCountBox").hidden = (this.numSubscriptions < 5);
+    E("issuesNoSubscriptionsBox").hidden = (type != "false negative" || this.numAppliedFilters > 0 || this.numGeneralSubscriptions > 0);
+    E("issuesSubscriptionCountBox").hidden = (this.numGeneralSubscriptions < 5);
 
     let ownFiltersBox = E("issuesOwnFilters");
     if (this.ownFilters.length && !ownFiltersBox.firstChild)