Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/Utils.cpp

Index: libadblockplus-android/jni/Utils.cpp
diff --git a/libadblockplus-android/jni/Utils.cpp b/libadblockplus-android/jni/Utils.cpp
index 282ae5b344ea6640f6a6de8c3daf89e6b8f87f13..52346aa4801e143cb5765b4c8ddeafb9e2daad70 100644
--- a/libadblockplus-android/jni/Utils.cpp
+++ b/libadblockplus-android/jni/Utils.cpp
@@ -166,12 +166,7 @@ JNIEnvAcquire::~JNIEnvAcquire()
 template<typename T>
 static jobject NewJniObject(JNIEnv* env, const 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::move(value))));
 }
 
 template<typename T>
@@ -182,19 +177,17 @@ static jobject NewJniObject(JNIEnv* env, const T& value, const char* javaClass)
   return NewJniObject(env, value, *clazz, ctor);
 }
 
-jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter)
+jobject NewJniFilter(JNIEnv* env, const AdblockPlus::Filter& filter)
 {
   return NewJniObject(env, filter, filterClass->Get(), filterCtor);
 }
 
-jobject NewJniSubscription(JNIEnv* env,
-    const AdblockPlus::SubscriptionPtr& subscription)
+jobject NewJniSubscription(JNIEnv* env, const AdblockPlus::Subscription& subscription)
 {
   return NewJniObject(env, subscription, subscriptionClass->Get(), subscriptionCtor);
 }
 
-jobject NewJniNotification(JNIEnv* env,
-    const AdblockPlus::NotificationPtr& notification)
+jobject NewJniNotification(JNIEnv* env, const AdblockPlus::Notification& notification)
 {
   return NewJniObject(env, notification, notificationClass->Get(), notificationCtor);
 }