Proxy configurators

src/org/adblockplus/android/AdblockPlus.java

Index: src/org/adblockplus/android/AdblockPlus.java
diff --git a/src/org/adblockplus/android/AdblockPlus.java b/src/org/adblockplus/android/AdblockPlus.java
index 3feb00dd56b1b2038ee42fefedb8103a8cf40e70..c5689e705922b648f0cd8b2c2fa6ec2958bb9fb2 100755
--- a/src/org/adblockplus/android/AdblockPlus.java
+++ b/src/org/adblockplus/android/AdblockPlus.java
@@ -23,11 +23,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
@@ -77,10 +74,6 @@ public class AdblockPlus extends Application
    */
   public static final String BROADCAST_SUBSCRIPTION_STATUS = "org.adblockplus.android.subscription.status";
   /**
-   * Broadcasted when filter match check is performed.
-   */
-  public static final String BROADCAST_FILTER_MATCHES = "org.adblockplus.android.filter.matches";
-  /**
    * Cached list of recommended subscriptions.
    */
   private Subscription[] subscriptions;
@@ -228,7 +221,6 @@ public class AdblockPlus extends Application
    */
   public Subscription[] getRecommendedSubscriptions()
   {
-    // TODO: Why don't we re-check?

[Felix Dahlke, 2014/08/19 09:06:00]

Any idea why we're caching recommended subscriptions here to begin with? Is
retrieving them that slow?

[René Jeschke, 2014/08/19 10:41:33]

IIRC, they are fetched from a contained XML file inside libadblockplus, so they
don't change, so caching makes sense.

     if (subscriptions == null)
       subscriptions = abpEngine.getRecommendedSubscriptions();
     return subscriptions;
@@ -340,7 +332,7 @@ public class AdblockPlus extends Application
    */
   public boolean matches(final String url, final String query, final String referrer, final String accept)
   {
-    final String fullUrl = !"".equals(query) ? url + "?" + query : url;
+    final String fullUrl = StringUtils.isNotEmpty(query) ? url + "?" + query : url;
     if (referrer != null)
       referrerMapping.add(fullUrl, referrer);
 
@@ -376,7 +368,8 @@ public class AdblockPlus extends Application
       contentType = "OTHER";
 
     final List<String> referrerChain = referrerMapping.buildReferrerChain(referrer);
-    Log.d("Referrer chain", fullUrl + ": " + referrerChain.toString());
+    // Currently disabled, we need some more control over what we log
+    // Log.d("Referrer chain", fullUrl + ": " + referrerChain.toString());

[Felix Dahlke, 2014/08/19 09:06:00]

Just remove it, that's fine.

[René Jeschke, 2014/08/19 10:41:33]

Done.

     final String[] referrerChainArray = referrerChain.toArray(new String[referrerChain.size()]);
     return abpEngine.matches(fullUrl, contentType, referrerChainArray);
   }