Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

jni/JniShowNotificationCallback.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 "JniCallbacks.h"
 
 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
   try
   {
-    return JniPtrToLong(new JniFilterChangeCallback(env, callbackObject));
+    return JniPtrToLong(new JniShowNotificationCallback(env, callbackObject));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  delete JniLongToTypePtr<JniFilterChangeCallback>(ptr);
+  delete JniLongToTypePtr<JniShowNotificationCallback>(ptr);
 }
 
-JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env,
+JniShowNotificationCallback::JniShowNotificationCallback(JNIEnv* env,
     jobject callbackObject)
-    : JniCallbackBase(env, callbackObject), jsValueClass(
-        new JniGlobalReference<jclass>(env, env->FindClass(PKG("JsValue"))))
+    : JniCallbackBase(env, callbackObject), notificationClass(
+        new JniGlobalReference<jclass>(env, env->FindClass(PKG("Notification"))))
 {
 }
 
-void JniFilterChangeCallback::Callback(const std::string& arg,
-    const AdblockPlus::JsValuePtr jsValue)
+void JniShowNotificationCallback::Callback(
+    const AdblockPlus::NotificationPtr& notificationPtr)
 {
   JNIEnvAcquire env(GetJavaVM());
 
   jmethodID method = env->GetMethodID(
       *JniLocalReference<jclass>(*env,
           env->GetObjectClass(GetCallbackObject())),
-      "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
+      "showNotificationCallback", "(" TYP("Notification") ")V");
 
   if (method)
   {
-    JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str()));
-    JniLocalReference<jobject> jJsValue(*env,
-        NewJniJsValue(*env, jsValue, jsValueClass->Get()));
-    env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue);
+    JniLocalReference<jobject> jNotification(*env, NewJniNotification(*env,
+        notificationPtr));
+    env->CallVoidMethod(GetCallbackObject(), method, *jNotification);
   }
 
   CheckAndLogJavaException(*env);
 }
 
 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_FilterChangeCallback_registerNatives(JNIEnv *env, jclass clazz)
+extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_ShowNotificationCallback_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }