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

jni/JniNotification.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
@@ skipping 49 matching lines @@
       enumName,
       TYP("Notification$Type"));
 
   return env->GetStaticObjectField(*enumClass, enumField);
 }
 
 static jstring JniGetTitle(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return env->NewStringUTF(GetNotificationPtr(ptr)->GetTitle().c_str());
+    return env->NewStringUTF(GetNotificationPtr(ptr)->GetTexts().title.c_str());
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jstring JniGetMessageString(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return env->NewStringUTF(GetNotificationPtr(ptr)->GetMessageString().c_str());
+    return env->NewStringUTF(GetNotificationPtr(ptr)->GetTexts().message.c_str());
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JniMarkAsShown(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
     GetNotificationPtr(ptr)->MarkAsShown();
   }
   CATCH_AND_THROW(env)
 }
 
 static JNINativeMethod methods[] =
 {
   { (char*) "markAsShown", (char*) "(J)V", (void*) JniMarkAsShown },
   { (char*) "getMessageString", (char*) "(J)Ljava/lang/String;", (void*) JniGetMessageString },
   { (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]));
 }