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
-  {
-    AdblockPlus::JsValue *jsValuePtr = JniGetJsValue(jsValue);
-    return JniPtrToLong(new AdblockPlus::FilterPtr(
-      new AdblockPlus::Filter(std::move(*jsValuePtr))));

[sergei, 2016/08/30 09:45:57]

What about using of
return JniPtrToLong(new
AdblockPlus::FilterPtr(dynamic_cast<AdblockPlus::FilterPtr&>(JniGetJsValuePtr(jsValue)));

and similar for Subscription?

We construct C++ Filter and Subscriptions in C++ FilterEngine and can do
whatever we need there, it's better to keep it that way and avoid constructing
of them manually.
- Subscription can have some members and the things get complicated.
- moving of *jsValuePtr can steal the actual value from FilterEngine, although
it's not true now.

However, in that case the internal state of Java Filter or Subscription is also
shared with others but on practice it's not shared now.

PS:
If there are some issues with address arithmetic in dynamic_cast then we should
rather address
https://hg.adblockplus.org/libadblockplus-android/file/tip/libadblockplus-and....

[sergei, 2016/08/30 10:07:31]

Even better without affecting address arithmetic
return JniPtrToLong(new
AdblockPlus::FilterPtr(*JniLongToTypePtr<AdblockPlus::FilterPtr>(jsValue)));
or even
return jsValue;

[anton, 2016/08/30 10:57:29]

Done.

-  }
-  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 },
   { (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]));
 }