Issue 5556 - make C++ implementation of LogSystem manageable only by JsEngine

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 14 matching lines @@
   protected final long ptr;
 
   static
   {
     System.loadLibrary("adblockplus-jni");
     registerNatives();
   }
 
   public JsEngine(final AppInfo appInfo, final LogSystem logSystem)
   {
-    this(ctor(appInfo, logSystem != null ? logSystem.ptr : 0));
+    this(ctor(appInfo, logSystem));
   }
 
   public JsEngine(final AppInfo appInfo)
   {
     this(appInfo, /* logSystem */null);

[anton, 2017/08/24 11:14:43]

please remove comment

[sergei, 2017/08/24 13:40:23]

Done.

   }
 
   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 74 matching lines @@
 
     @Override
     public void dispose()
     {
       dtor(this.ptr);
     }
   }
 
   private final static native void registerNatives();
 
-  private final static native long ctor(AppInfo appInfo, long logSystemPtr);
+  private final static native long ctor(AppInfo appInfo, LogSystem logSystem);
 
   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 void setWebRequest(long ptr, long webRequestPtr);
 
   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);
 }