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

jni/JniFilterEngine.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 99 matching lines @@
   std::string url = JniJavaToStdString(env, jUrl);
 
   try
   {
     AdblockPlus::SubscriptionPtr subscription = engine->GetSubscription(url);
 
     return NewJniSubscription(env, subscription);
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
-
-/**

[Felix Dahlke, 2015/11/20 07:53:52]

I don't really get this part - this is the first time we use a doc comment here,
and it seems to be for a commented out function (SetShowNotificationCallback)?

[René Jeschke, 2015/11/20 12:19:15]

Argh, sry, left-over from copy'n'paste for implementation. *cough*

Removed.

- * Sets the callback invoked when a notification should be shown.
- * @param callback Callback to invoke.
- */
-//void SetShowNotificationCallback(const ShowNotificationCallback& value);
 
 static void JNICALL JniShowNextNotification(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
   std::string url = JniJavaToStdString(env, jUrl);
 
   try
   {
     engine->ShowNextNotification(url);
   }
@@ skipping 265 matching lines @@
   { (char*)"matches", (char*)"(JLjava/lang/String;" TYP("FilterEngine$ContentType") "[Ljava/lang/String;)" TYP("Filter"), (void*)JniMatchesMany },
   { (char*)"getPref", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetPref },
   { (char*)"setPref", (char*)"(JLjava/lang/String;J)V", (void*)JniSetPref },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }