ABP/Android JavaScript code

assets/js/start.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
+function removeTrailingDots(string)
+{
+  return string.replace(/\.+$/, "");
+}
+
 /**
  * Checks whether a request is third party for the given document, uses
  * information from the public suffix list to determine the effective domain
  * name for the document.
  */
 function isThirdParty(requestHost, documentHost)
 {
-  // Remove trailing dots
-  requestHost = requestHost.replace(/\.+$/, "");

[Felix Dahlke, 2012/11/09 14:59:16]

Bit of a nit pick, but how about having a function removeTrailingDots(string)?
Would remove duplication and make the comment above redundant.

[Andrey Novikov, 2012/11/12 09:33:12]

Done.

-  documentHost = documentHost.replace(/\.+$/, "");
+  requestHost = removeTrailingDots(requestHost);
+  documentHost = removeTrailingDots(documentHost);
 
   // Extract domain name - leave IP addresses unchanged, otherwise leave only base domain
   var documentDomain = getBaseDomain(documentHost);
   if (requestHost.length > documentDomain.length)
     return (requestHost.substr(requestHost.length - documentDomain.length - 1) != "." + documentDomain);
   else
     return (requestHost != documentDomain);
 }
 
 function reportError(exp)
@@ skipping 275 matching lines @@
     if (file instanceof FakeInputStream)
       this.lines = file.lines;
     else
       this.lines = Android.fileRead(file.path).split(/\n/);
   },
   readLine: function(line)
   {
     if (this.currentIndex < this.lines.length)
       line.value = this.lines[this.currentIndex];
     this.currentIndex++;
     return (this.currentIndex < this.lines.length);

[Felix Dahlke, 2012/11/09 14:59:16]

This check is done twice, temp variable?

[Andrey Novikov, 2012/11/12 09:33:12]

No, currentIndex is plusplused after first check.

[Felix Dahlke, 2012/11/13 07:53:14]

OK, didn't notice.

   },
   close: function() {},
   QueryInterface: function()
   {
     return this;
   }
 };
 
 function FakeOutputStream()
 {
@@ skipping 199 matching lines @@
 }
 
 function stopInteractive()
 {
   FilterNotifier.removeListener(onFilterChange);
 }
 
 function matchesAny(url, query, reqHost, refHost, accept)
 {
   var contentType = null;
-  var thirdParty = false;
+  var thirdParty = true;
 
   if (accept != "")
   {
     if (accept.indexOf("text/css") != -1)
       contentType = "STYLESHEET";
     else if (accept.indexOf("image/*" != -1))
       contentType = "IMAGE";
   }
 
   if (contentType == null)
@@ skipping 12 matching lines @@
     contentType = "OTHER";
 
   if (refHost != "")
   {
     thirdParty = isThirdParty(reqHost, refHost);
   }
 
   if (query != "")
     url = url + "?" + query;
 
-  return defaultMatcher.matchesAny(url, contentType, null, thirdParty) != null;
+  var filter = defaultMatcher.matchesAny(url, contentType, null, thirdParty);
+
+  return (filter != null && !(filter instanceof WhitelistFilter));
 }
 
 Android.load("XMLHttpRequest.jsm");
 Android.load("FilterNotifier.jsm");
 Android.load("FilterClasses.jsm");
 Android.load("SubscriptionClasses.jsm");
 Android.load("FilterStorage.jsm");
 Android.load("FilterListener.jsm");
 Android.load("Matcher.jsm");
 Android.load("ElemHide.jsm");
 Android.load("Synchronizer.jsm");
 
 FilterListener.startup();
 Synchronizer.startup();
 
 Android.load("publicSuffixList.js");
 Android.load("punycode.js");
 Android.load("basedomain.js");