Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/JniNotification.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 19 matching lines @@
 {
   if (notificationEnumClass)
   {
     delete notificationEnumClass;
     notificationEnumClass = NULL;
   }
 }
 
 static AdblockPlus::Notification* GetNotificationPtr(jlong ptr)
 {
-  return JniLongToTypePtr<AdblockPlus::NotificationPtr>(ptr)->get();
+  return JniLongToTypePtr<AdblockPlus::Notification>(ptr);

[sergei, 2017/04/26 09:21:00]

as far as I remember we store the pointer in Java JsValue.

Strictly speaking before passing the pointer to JsValue it should be converted
to `JsValue*` (the best way would be without cutting corners, namely accept a
pointer to Notification in Java Notification and before passing it to base Java
JsValue it should be casted to pointer to JsValue*) and here we need to cast it
back as
static_cast<AdblockPlus::Notification*>(JniGetJsValuePtr(ptr));

It's also valid for Filter and Subscription.

To tell the truth I don't like the idea when we publicly derive from JsValue, so
I would rather propose to think in advance and minimize the usage of this fact.

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

No, we do create the same object class as it was passed to NewObject() and now
it's concrete class (not base JsValue).
Same for Filter and Subscriptions

[sergei, 2017/04/26 14:12:56]

Let's consider an example with Notification.
Java class Notification derives from JsValue,
https://github.com/adblockplus/libadblockplus-android/blob/master/libadblockp...
It accepts a pointer to C++ Notification and passes it to Java JsValue as a
pointer to JsValue
https://github.com/adblockplus/libadblockplus-android/blob/master/libadblockp....
Here I think it should not pass pointer to Notification as a pointer to JsValue
even if it works right now.
Instead of `super(ptr);` it should be
`super(CastNotificationPtrToJsValuePtr(ptr));` and when we get this pointer back
from base Java JsValue we should cast JsValue* to Notification* using
static_cast. However, it would be good if you could tell me what methods of
JsValue are actually required to use Notification, Filter and Subscription, so
we can implement them on the these concrete classes and hide/remove the
inheritance from JsValue.

[anton, 2017/04/27 06:21:01]

We pass just `long` value to Java side without any type specification and it's
up to c++ jni side to cast it to correct type.
So we do create Notification* ptr and then cast it as Notification* ptr later:
https://github.com/adblockplus/libadblockplus-android/blob/8c60759bc1df5a0b04....

Same for Filter and Subscription.

 }
 
 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::NotificationType type;
   try
   {
     type = GetNotificationPtr(ptr)->GetType();
   }
   CATCH_THROW_AND_RETURN(env, 0)
@@ skipping 58 matching lines @@
   { (char*) "getTitle", (char*) "(J)Ljava/lang/String;", (void*) JniGetTitle },
   { (char*) "getType", (char*) "(J)" TYP("Notification$Type"), (void*) JniGetType }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Notification_registerNatives(
     JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }