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
@@ skipping 12 matching lines @@
 {
   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)
+  public JsEngine(final AppInfo appInfo, final LogSystem logSystem, final WebRequest webRequest, final String basePath)
   {
-    this(ctor(appInfo, logSystem, webRequest));
+    this(ctor(appInfo, logSystem, webRequest, basePath));
   }
 
-  public JsEngine(final AppInfo appInfo, final WebRequest webRequest)
+  public JsEngine(final AppInfo appInfo, final WebRequest webRequest, final String basePath)

[anton, 2017/09/01 09:49:50]

Since ctor becase too heavy i'd prefer to leave just 2 ctors - with appinfo only
and with all the arguments.
There can be lots of combinations of ctors with missing arguments so there is no
point in having this particular ctor.

[sergei, 2017/09/01 09:58:34]

Done in https://codereview.adblockplus.org/29533581/

   {
-    this(appInfo, null, webRequest);
+    this(appInfo, null, webRequest, basePath);
   }
 
   public JsEngine(final AppInfo appInfo)
   {
-    this(appInfo, null, null);
+    this(appInfo, null, null, null);
   }
 
   protected JsEngine(final long ptr)
   {
     this.ptr = ptr;
     this.disposer = new Disposer(this, new DisposeWrapper(ptr));
   }
 
   public void setEventCallback(final String eventName, final EventCallback callback)
   {
@@ skipping 25 matching lines @@
     }
 
     triggerEvent(this.ptr, eventName, args);
   }
 
   public void triggerEvent(final String eventName)
   {
     triggerEvent(this.ptr, eventName, null);
   }
 
-  public void setDefaultFileSystem(final String basePath)
-  {
-    setDefaultFileSystem(this.ptr, basePath);
-  }
-
   public JsValue newValue(final long value)
   {
     return newValue(this.ptr, value);
   }
 
   public JsValue newValue(final boolean value)
   {
     return newValue(this.ptr, value);
   }
 
@@ skipping 19 matching lines @@
 
     @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);
+  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 void setDefaultFileSystem(long ptr, String basePath);
-
   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);
 }