Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e

src/org/adblockplus/libadblockplus/FilterEngine.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 12 matching lines @@
 {
   private final Disposer disposer;
   protected final long ptr;
 
   static
   {
     System.loadLibrary("adblockplus-jni");
     registerNatives();
   }
 
+  public static enum ContentType
+  {
+    OTHER, SCRIPT, IMAGE, STYLESHEET, OBJECT, SUBDOCUMENT, DOCUMENT, XMLHTTPREQUEST,
+    OBJECT_SUBREQUEST, FONT, MEDIA
+  }
+
   public FilterEngine(final JsEngine jsEngine)
   {
     this.ptr = ctor(jsEngine.ptr);
     this.disposer = new Disposer(this, new DisposeWrapper(this.ptr));
   }
 
   public boolean isFirstRun()
   {
     return isFirstRun(this.ptr);
   }
@@ skipping 31 matching lines @@
   public void setFilterChangeCallback(final FilterChangeCallback callback)
   {
     setFilterChangeCallback(this.ptr, callback.ptr);
   }
 
   public void forceUpdateCheck()
   {
     forceUpdateCheck(this.ptr, 0);
   }
 
-  public void forceUpdateCheck(final UpdaterCallback callback)
+  public void forceUpdateCheck(final UpdateCheckDoneCallback callback)
   {
     forceUpdateCheck(this.ptr, callback != null ? callback.ptr : 0);
   }
 
   public List<String> getElementHidingSelectors(final String domain)
   {
     return getElementHidingSelectors(this.ptr, domain);
   }
 
-  public Filter matches(final String url, final String contentType, final String documentUrl)
+  public Filter matches(final String url, final ContentType contentType, final String documentUrl)
   {
     return matches(this.ptr, url, contentType, documentUrl);
   }
 
-  public Filter matches(final String url, final String contentType, final String[] documentUrls)
+  public Filter matches(final String url, final ContentType contentType, final String[] documentUrls)
   {
     return matches(this.ptr, url, contentType, documentUrls);
   }
 
   public JsValue getPref(final String pref)
   {
     return getPref(this.ptr, pref);
   }
 
   public void setPref(final String pref, final JsValue value)
@@ skipping 42 matching lines @@
   private final static native void removeFilterChangeCallback(long ptr);
 
   private final static native void setFilterChangeCallback(long ptr, long filterPtr);
 
   private final static native void forceUpdateCheck(long ptr, long updatePtr);
 
   private final static native List<String> getElementHidingSelectors(long ptr, String domain);
 
   private final static native JsValue getPref(long ptr, String pref);
 
-  private final static native Filter matches(long ptr, String url, String contentType, String documentUrl);
+  private final static native Filter matches(long ptr, String url, ContentType contentType, String documentUrl);
 
-  private final static native Filter matches(long ptr, String url, String contentType, String[] documentUrls);
+  private final static native Filter matches(long ptr, String url, ContentType contentType, String[] documentUrls);
 
   private final static native void setPref(long ptr, String pref, long valuePtr);
 
   private final static native void dtor(long ptr);
 }