Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/JniEventCallback.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 18 matching lines @@
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
   delete JniLongToTypePtr<JniEventCallback>(ptr);
 }
 
 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject)
   : JniCallbackBase(env, callbackObject)
 {
 }
 
-void JniEventCallback::Callback(const AdblockPlus::JsValueList& params)
+void JniEventCallback::Callback(AdblockPlus::JsValueList&& params)
 {
   JNIEnvAcquire env(GetJavaVM());
 
   jmethodID method = env->GetMethodID(
       *JniLocalReference<jclass>(*env,
           env->GetObjectClass(GetCallbackObject())),
       "eventCallback", "(Ljava/util/List;)V");
 
   if (method)
   {
-    jobject jsList = JniJsValueListToArrayList(*env, params);

[sergei, 2017/04/26 09:20:59]

That's a good point, I think libadblockplus should add the callback type
accepting r-value to params, not sure whether it's possible to all methods,
though.

[anton, 2017/04/26 10:22:58]

Acknowledged.

+    jobject jsList = JniJsValueListToArrayList(*env, std::move(params));
     env->CallVoidMethod(GetCallbackObject(), method, jsList);
   }
 }
 
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallback_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }