Issue 3461 - Fixed: Issue Reporter assumes that RequestEntry.filter is a Filter instance, not a str…

chrome/content/ui/sendReport.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 812 matching lines @@
         E("updateInProgress").hidden = "true";
 
         let filtersRemoved = false;
         let requests = requestsDataSource.origRequests;
         for (let i = 0; i < requests.length; i++)
         {
           if (!requests[i].filter)
             continue;
 
           let filter = Filter.fromText(requests[i].filter);
-          if (!filter.subscriptions.filter(s => !s.disabled).length)

[Sebastian Noack, 2016/01/05 09:20:52]

How about |filter.subscriptions.some(s => !s.disabled)|? Or do you consider that
a too risky unrelated change as well?

[Wladimir Palant, 2016/01/05 09:50:08]

This functionality isn't exactly easy to test. But... ok, done.

+          if (!filter.subscriptions.some(s => !s.disabled))
             filtersRemoved = true;
         }
 
         if (filtersRemoved)
         {
           // Force the user to reload the page
           E("updateFixedIssue").hidden = false;
           document.documentElement.canAdvance = true;
 
           let nextButton = document.documentElement.getButton("next");
@@ skipping 67 matching lines @@
     {
       return subscriptionsDataSource.subscriptionFilter(s);
     }
     else
       return false;
   },
 
   collectData: function(wnd, windowURI, callback)
   {
     this.contentWnd = wnd;
-    this.whitelistFilter = Policy.isWindowWhitelisted(wnd);
+    this.whitelistFilter = Policy.isWhitelisted(windowURI.spec);

[Wladimir Palant, 2016/01/05 09:50:08]

A change is being shown in the interdiff here - this is due to rebasing.

 
     if (!this.whitelistFilter && this.isEnabled)
     {
       // Find disabled filters in active subscriptions matching any of the requests
       let disabledMatcher = new CombinedMatcher();
       for (let subscription of FilterStorage.subscriptions)
       {
         if (subscription.disabled)
           continue;
 
@@ skipping 658 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;");
 }