Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/Utils.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 146 matching lines @@
 
 JNIEnvAcquire::~JNIEnvAcquire()
 {
   if (attachmentStatus == JNI_EDETACHED)
   {
     javaVM->DetachCurrentThread();
   }
 }
 
 template<typename T>
-static jobject NewJniObject(JNIEnv* env, const T& value, jclass clazz, jmethodID ctor)
+static jobject NewJniObject(JNIEnv* env, T&& value, jclass clazz, jmethodID ctor)
 {
-  if (!value.get())
-  {
-    return 0;
-  }
-
-  return env->NewObject(clazz, ctor, JniPtrToLong(new T(value)));
+  return env->NewObject(clazz, ctor, JniPtrToLong(new T(std::forward<T>(value))));
 }
 
-template<typename T>
-static jobject NewJniObject(JNIEnv* env, const T& value, const char* javaClass)
+jobject NewJniFilter(JNIEnv* env, AdblockPlus::Filter&& filter)
 {
-  JniLocalReference<jclass> clazz( env, env->FindClass(javaClass));
-  jmethodID ctor = env->GetMethodID(*clazz, "<init>", "(J)V");
-  return NewJniObject(env, value, *clazz, ctor);
+  return NewJniObject<AdblockPlus::Filter>(
+    env, std::move(filter), filterClass->Get(), filterCtor);
 }
 
-jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter)
+jobject NewJniSubscription(JNIEnv* env, AdblockPlus::Subscription&& subscription)
 {
-  return NewJniObject(env, filter, filterClass->Get(), filterCtor);
+  return NewJniObject<AdblockPlus::Subscription>(
+    env, std::move(subscription), subscriptionClass->Get(), subscriptionCtor);
 }
 
-jobject NewJniSubscription(JNIEnv* env,
-    const AdblockPlus::SubscriptionPtr& subscription)
+jobject NewJniNotification(JNIEnv* env, AdblockPlus::Notification&& notification)
 {
-  return NewJniObject(env, subscription, subscriptionClass->Get(), subscriptionCtor);
+  return NewJniObject<AdblockPlus::Notification>(
+    env, std::move(notification), notificationClass->Get(), notificationCtor);
 }
-
-jobject NewJniNotification(JNIEnv* env,
-    const AdblockPlus::NotificationPtr& notification)
-{
-  return NewJniObject(env, notification, notificationClass->Get(), notificationCtor);
-}