Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e

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
@@ skipping 11 matching lines @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Calendar;
 import java.util.List;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import org.adblockplus.android.updater.AlarmReceiver;
+import org.adblockplus.libadblockplus.FilterEngine.ContentType;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlarmManager;
 import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ skipping 290 matching lines @@
    */
   public boolean matches(final String url, final String query, final String referrer, final String accept)
   {
     final String fullUrl = StringUtils.isNotEmpty(query) ? url + "?" + query : url;
     if (referrer != null)
       referrerMapping.add(fullUrl, referrer);
 
     if (!filteringEnabled)
       return false;
 
-    String contentType = null;
+    ContentType contentType = null;
 
     if (accept != null)
     {
       if (accept.contains("text/css"))
-        contentType = "STYLESHEET";
+        contentType = ContentType.STYLESHEET;
       else if (accept.contains("image/*"))
-        contentType = "IMAGE";
+        contentType = ContentType.IMAGE;
       else if (accept.contains("text/html"))
-        contentType = "SUBDOCUMENT";
+        contentType = ContentType.SUBDOCUMENT;
     }
 
     if (contentType == null)
     {
       if (RE_JS.matcher(url).find())
-        contentType = "SCRIPT";
+        contentType = ContentType.SCRIPT;
       else if (RE_CSS.matcher(url).find())
-        contentType = "STYLESHEET";
+        contentType = ContentType.STYLESHEET;
       else if (RE_IMAGE.matcher(url).find())
-        contentType = "IMAGE";
+        contentType = ContentType.IMAGE;
       else if (RE_FONT.matcher(url).find())
-        contentType = "FONT";
+        contentType = ContentType.FONT;
       else if (RE_HTML.matcher(url).find())
-        contentType = "SUBDOCUMENT";
+        contentType = ContentType.SUBDOCUMENT;
     }
     if (contentType == null)
-      contentType = "OTHER";
+      contentType = ContentType.OTHER;
 
     final List<String> referrerChain = referrerMapping.buildReferrerChain(referrer);
     final String[] referrerChainArray = referrerChain.toArray(new String[referrerChain.size()]);
     return abpEngine.matches(fullUrl, contentType, referrerChainArray);
   }
 
   /**
    * Checks if filtering is enabled.
    */
   public boolean isFilteringEnabled()
@@ skipping 117 matching lines @@
       Log.e(TAG, e.getMessage(), e);
     }
 
     // Set crash handler
     Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
 
     // Initiate update check
     scheduleUpdater(0);
   }
 }