Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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.libadblockplus;
 
 import java.util.List;
 
-public final class FilterEngine implements Disposable
+public final class FilterEngine
 {
-  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
+    OTHER, SCRIPT, IMAGE, STYLESHEET, OBJECT, SUBDOCUMENT, DOCUMENT, WEBSOCKET,
+    WEBRTC, PING, XMLHTTPREQUEST, OBJECT_SUBREQUEST, MEDIA, FONT, GENERICBLOCK,
+    ELEMHIDE, GENERICHIDE
   }
 
-  public FilterEngine(final JsEngine jsEngine, final IsAllowedConnectionCallback isSubscriptionDownloadAllowedCallback)
+  FilterEngine(long jniPlatformPtr)
   {
-    this.ptr = ctor(jsEngine.ptr, isSubscriptionDownloadAllowedCallback);
-    this.disposer = new Disposer(this, new DisposeWrapper(this.ptr));
-  }
-
-  public FilterEngine(final JsEngine jsEngine)
-  {
-    this(jsEngine, null);
+    this.ptr = jniPlatformPtr;
   }
 
   public boolean isFirstRun()
   {
     return isFirstRun(this.ptr);
   }
 
   public Filter getFilter(final String text)
   {
     return getFilter(this.ptr, text);
@@ skipping 137 matching lines @@
   /**
    * Schedules updating of a subscription corresponding to the passed URL.
    * @param subscriptionUrl may contain query parameters, only the beginning of the string is used
    *                       to find a corresponding subscription.
    */
   public void updateFiltersAsync(String subscriptionUrl)
   {
     updateFiltersAsync(this.ptr, subscriptionUrl);
   }
 
-  @Override
-  public void dispose()
-  {
-    this.disposer.dispose();
-  }
-
-  private final static class DisposeWrapper implements Disposable
-  {
-    private final long ptr;
-
-    public DisposeWrapper(final long ptr)
-    {
-      this.ptr = ptr;
-    }
-
-    @Override
-    public void dispose()
-    {
-      dtor(this.ptr);
-    }
-  }
-
   private final static native void registerNatives();
 
-  private final static native long ctor(long jsEnginePtr, IsAllowedConnectionCallback isSubscriptionDownloadAllowedCallback);
-
   private final static native boolean isFirstRun(long ptr);
 
   private final static native Filter getFilter(long ptr, String text);
 
   private final static native List<Filter> getListedFilters(long ptr);
 
   private final static native Subscription getSubscription(long ptr, String url);
 
   private final static native List<Subscription> getListedSubscriptions(long ptr);
 
@@ skipping 35 matching lines @@
 
   private final static native String getAllowedConnectionType(long ptr);
 
   private final static native void setAcceptableAdsEnabled(long ptr, boolean enabled);
 
   private final static native boolean isAcceptableAdsEnabled(long ptr);
 
   private final static native String getAcceptableAdsSubscriptionURL(long ptr);
 
   private final static native void updateFiltersAsync(long ptr, String subscriptionUrl);
-
-  private final static native void dtor(long ptr);
 }