Issue 4188 - Update libadblockplus-android to use the latest libadblockplus

libadblockplus-android/jni/JniFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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/>.
  */
 
 #include <AdblockPlus.h>
 #include "Utils.h"
 #include "JniJsValue.h"
 
 static AdblockPlus::Filter* GetFilterPtr(jlong ptr)
 {
   return JniLongToTypePtr<AdblockPlus::FilterPtr>(ptr)->get();
-}
-
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jsValue)
-{
-  try
-  {
-    return JniPtrToLong(new AdblockPlus::FilterPtr(
-            *JniLongToTypePtr<AdblockPlus::FilterPtr>(jsValue)));
-  }
-  CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::Filter::Type type;
   try
   {
     type = GetFilterPtr(ptr)->GetType();
   }
   CATCH_THROW_AND_RETURN(env, 0)
@@ skipping 62 matching lines @@
 
   try
   {
     return *me == *other ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static JNINativeMethod methods[] =
 {
-  { (char*)"ctor", (char*)"(J)J", (void*)JniCtor },

[sergei, 2016/08/30 12:52:54]

Who deletes created in JniCtor "new AdblockPlus::FilterPtr"? Should we add
"dtor"?
I think we should ignore leaking of "jsValue" arg of "JniCtor" for presence
because I guess "new T" (https://issues.adblockplus.org/ticket/4153#comment:1)
is incorrect way.

[sergei, 2016/08/31 13:21:04]

I see that constructor of Filter passes argument to the base class JsValue which
cares about deleting of C++ class. So technically we don't need dtor here.
However there are several issues:
- in JniCtor we create "shared_ptr<Filter>*" but in JniDtor (see JniJsValue.cpp)
we cast it to "shared_ptr<JsValue>*" and call delete operator. It seems it works
so far in that particular case but in general it's like "delete ((B*)new A())"
where A and B are just arbitrary classes, thus we are calling destructor of
class B for the pointer to object of class A.
- It's actually unclear what is behind "jlong jsValue" and if it's a pointer who
is responsible for that pointer?

   { (char*)"getType", (char*)"(J)" TYP("Filter$Type"), (void*)JniGetType },
   { (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed },
   { (char*)"addToList", (char*)"(J)V", (void*)JniAddToList },
   { (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList },
   { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Filter_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }