Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

src/org/adblockplus/libadblockplus/FilterEngine.java

Index: src/org/adblockplus/libadblockplus/FilterEngine.java
diff --git a/src/org/adblockplus/libadblockplus/FilterEngine.java b/src/org/adblockplus/libadblockplus/FilterEngine.java
index 05ea17028eacc5a7efe62ca27127a3ee44465e55..2849141e449217f83d8b560495c6e4ddd80eff52 100644
--- a/src/org/adblockplus/libadblockplus/FilterEngine.java
+++ b/src/org/adblockplus/libadblockplus/FilterEngine.java
@@ -107,29 +107,39 @@ public final class FilterEngine implements Disposable
     return getElementHidingSelectors(this.ptr, domain);
   }
 
-  public Filter matches(final String url, final ContentType contentType, final String documentUrl)
+  public void showNextNotification(final String url)
   {
-    return matches(this.ptr, url, contentType, documentUrl);
+    showNextNotification(this.ptr, url);
   }
 
-  public Filter matches(final String url, final ContentType contentType, final String[] documentUrls)
+  public void showNextNotification()
   {
-    return matches(this.ptr, url, contentType, documentUrls);
+    showNextNotification(this.ptr, null);
   }
 
-  public JsValue getPref(final String pref)
+  public void setShowNotificationCallback(final ShowNotificationCallback callback)
   {
-    return getPref(this.ptr, pref);
+    setShowNotificationCallback(this.ptr, callback.ptr);
+  }
+
+  public void removeShowNotificationCallback()
+  {
+    removeShowNotificationCallback(this.ptr);
+  }
+
+  public Filter matches(final String url, final ContentType contentType, final String documentUrl)
+  {
+    return matches(this.ptr, url, contentType, documentUrl);
   }
 
-  public Notification getNextNotificationToShow(String url)
+  public Filter matches(final String url, final ContentType contentType, final String[] documentUrls)
   {
-    return getNextNotificationToShow(this.ptr, url);
+    return matches(this.ptr, url, contentType, documentUrls);
   }
 
-  public Notification getNextNotificationToShow()
+  public JsValue getPref(final String pref)
   {
-    return this.getNextNotificationToShow(null);
+    return getPref(this.ptr, pref);
   }
 
   public void setPref(final String pref, final JsValue value)
@@ -187,14 +197,18 @@ public final class FilterEngine implements Disposable
 
   private final static native List<String> getElementHidingSelectors(long ptr, String domain);
 
+  private final static native void showNextNotification(long ptr, String url);
+
+  private final static native void setShowNotificationCallback(long ptr, long callbackPtr);
+
+  private final static native void removeShowNotificationCallback(long ptr);
+
   private final static native JsValue getPref(long ptr, String pref);
 
   private final static native Filter matches(long ptr, String url, ContentType contentType, String documentUrl);
 
   private final static native Filter matches(long ptr, String url, ContentType contentType, String[] documentUrls);
 
-  private final static native Notification getNextNotificationToShow(long ptr, String url);
-
   private final static native void setPref(long ptr, String pref, long valuePtr);
 
   private final static native void dtor(long ptr);