Proxy configurators

src/org/adblockplus/android/AdblockPlus.java

 /*
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.io.BufferedReader;
 import java.io.File;
 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;
 
 import org.adblockplus.android.updater.AlarmReceiver;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlarmManager;
 import android.app.Application;
@@ skipping 29 matching lines @@
   public static final int UPDATE_NOTIFICATION_ID = R.string.app_name + 1;
   /**
    * Broadcasted when filtering is enabled or disabled.
    */
   public static final String BROADCAST_FILTERING_CHANGE = "org.adblockplus.android.filtering.status";
   /**
    * Broadcasted when subscription status changes.
    */
   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;
   /**
    * Indicates whether filtering is enabled or not.
    */
   private boolean filteringEnabled = false;
 
   private ABPEngine abpEngine;
 
@@ skipping 127 matching lines @@
   public boolean isFirstRun()
   {
     return abpEngine.isFirstRun();
   }
 
   /**
    * Returns list of known subscriptions.
    */
   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;
   }
 
   /**
    * Returns list of enabled subscriptions.
    */
   public Subscription[] getListedSubscriptions()
   {
@@ skipping 91 matching lines @@
    *          Request query string
    * @param referrer
    *          Request referrer header
    * @param accept
    *          Request accept header
    * @return true if matched filter was found
    * @throws Exception
    */
   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);
 
     if (!filteringEnabled)
       return false;
 
     String contentType = null;
 
     if (accept != null)
     {
@@ skipping 15 matching lines @@
         contentType = "IMAGE";
       else if (RE_FONT.matcher(url).find())
         contentType = "FONT";
       else if (RE_HTML.matcher(url).find())
         contentType = "SUBDOCUMENT";
     }
     if (contentType == null)
       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);
   }
 
   /**
    * Checks if filtering is enabled.
    */
   public boolean isFilteringEnabled()
   {
     return filteringEnabled;
@@ skipping 115 matching lines @@
       Log.e(TAG, e.getMessage(), e);
     }
 
     // Set crash handler
     Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
 
     // Initiate update check
     scheduleUpdater(0);
   }
 }