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

libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.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 JsEngine implements Disposable
+public final class JsEngine
 {
-  private final Disposer disposer;
   protected final long ptr;
 
   static
   {
     System.loadLibrary("adblockplus-jni");
     registerNatives();
   }
 
-  public JsEngine(final AppInfo appInfo, final LogSystem logSystem, final WebRequest webRequest, final String basePath)
-  {
-    this(ctor(appInfo, logSystem, webRequest, basePath));
-  }
-
-  public JsEngine(final AppInfo appInfo)
-  {
-    this(appInfo, null, null, null);
-  }
-
-  protected JsEngine(final long ptr)
+  JsEngine(final long ptr)

[anton, 2017/09/06 06:21:27]

`public` here is required (unless it's done intentionally)

[sergei, 2017/09/08 09:45:01]

It's done indeed deliberately in order to express that an arbitrary
instantiation of JsEngine is not intended, only Platform can and may do it.

   {
     this.ptr = ptr;
-    this.disposer = new Disposer(this, new DisposeWrapper(ptr));
   }
 
   public void setEventCallback(final String eventName, final EventCallback callback)
   {
     setEventCallback(this.ptr, eventName, callback.ptr);
   }
 
   public void removeEventCallback(final String eventName)
   {
     removeEventCallback(this.ptr, eventName);
@@ skipping 34 matching lines @@
   public JsValue newValue(final boolean value)
   {
     return newValue(this.ptr, value);
   }
 
   public JsValue newValue(final String value)
   {
     return newValue(this.ptr, value);
   }
 
-  @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(AppInfo appInfo, LogSystem logSystem, WebRequest webRequest,
-                                        String basePath);
-
   private final static native void setEventCallback(long ptr, String eventName, long callback);
 
   private final static native void removeEventCallback(long ptr, String eventName);
 
   private final static native JsValue evaluate(long ptr, String source, String filename);
 
   private final static native void triggerEvent(long ptr, String eventName, long[] args);
 
   private final static native JsValue newValue(long ptr, long value);
 
   private final static native JsValue newValue(long ptr, boolean value);
 
   private final static native JsValue newValue(long ptr, String value);
-
-  private final static native void dtor(long ptr);
 }