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 100 matching lines @@
 
   try
   {
     AdblockPlus::SubscriptionPtr subscription = engine->GetSubscription(url);
 
     return NewJniSubscription(env, subscription);
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
-static jobject JNICALL JniGetNextNotificationToShow(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl)
+/**

[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
   {
-    AdblockPlus::NotificationPtr notification = engine->GetNextNotificationToShow(url);
+    engine->ShowNextNotification(url);
+  }
+  CATCH_AND_THROW(env);
+}
 
-    return NewJniNotification(env, notification);
+static void JNICALL JniSetShowNotificationCallback(JNIEnv* env, jclass clazz,
+                                                  jlong ptr, jlong callbackPtr)
+{
+  AdblockPlus::FilterEngine* const engine =
+      JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
+  JniShowNotificationCallback* const callback =
+      JniLongToTypePtr<JniShowNotificationCallback>(callbackPtr);
+  AdblockPlus::FilterEngine::ShowNotificationCallback showNotificationCallback =
+      std::bind(&JniShowNotificationCallback::Callback, callback,
+                     std::placeholders::_1);
+  try
+  {
+    engine->SetShowNotificationCallback(showNotificationCallback);
   }
-  CATCH_THROW_AND_RETURN(env, 0);
+  CATCH_AND_THROW(env)
+}
+
+static void JNICALL JniRemoveShowNotificationCallback(JNIEnv* env, jclass clazz, jlong ptr)
+{
+  AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
+
+  try
+  {
+    engine->RemoveShowNotificationCallback();
+  }
+  CATCH_AND_THROW(env);
 }
 
 static jobject JNICALL JniGetListedSubscriptions(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
 
   try
   {
     std::vector<AdblockPlus::SubscriptionPtr> subscriptions = engine->GetListedSubscriptions();
 
@@ skipping 28 matching lines @@
 }
 
 static void JNICALL JniSetUpdateAvailableCallback(JNIEnv* env, jclass clazz,
                                                   jlong ptr, jlong callbackPtr)
 {
   AdblockPlus::FilterEngine* const engine =
       JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
   JniUpdateAvailableCallback* const callback =
       JniLongToTypePtr<JniUpdateAvailableCallback>(callbackPtr);
   AdblockPlus::FilterEngine::UpdateAvailableCallback updateAvailableCallback =
-      std::tr1::bind(&JniUpdateAvailableCallback::Callback, callback,
-                     std::tr1::placeholders::_1);
+      std::bind(&JniUpdateAvailableCallback::Callback, callback,
+                     std::placeholders::_1);
   try
   {
     engine->SetUpdateAvailableCallback(updateAvailableCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniRemoveFilterChangeCallback(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
 
   try
   {
     engine->RemoveFilterChangeCallback();
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetFilterChangeCallback(JNIEnv* env, jclass clazz,
     jlong ptr, jlong filterPtr)
 {
   AdblockPlus::FilterEngine* engine =
       JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
   JniFilterChangeCallback* callback = JniLongToTypePtr<JniFilterChangeCallback>(
       filterPtr);
 
   AdblockPlus::FilterEngine::FilterChangeCallback filterCallback =
-      std::tr1::bind(&JniFilterChangeCallback::Callback, callback,
-          std::tr1::placeholders::_1, std::tr1::placeholders::_2);
+      std::bind(&JniFilterChangeCallback::Callback, callback,
+          std::placeholders::_1, std::placeholders::_2);
 
   try
   {
     engine->SetFilterChangeCallback(filterCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniForceUpdateCheck(JNIEnv* env, jclass clazz, jlong ptr, jlong updaterPtr)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
   JniUpdateCheckDoneCallback* callback =
       JniLongToTypePtr<JniUpdateCheckDoneCallback>(updaterPtr);
 
   AdblockPlus::FilterEngine::UpdateCheckDoneCallback
       updateCheckDoneCallback = 0;
 
   if (updaterPtr)
   {
     updateCheckDoneCallback =
-        std::tr1::bind(&JniUpdateCheckDoneCallback::Callback, callback,
-                       std::tr1::placeholders::_1);
+        std::bind(&JniUpdateCheckDoneCallback::Callback, callback,
+                       std::placeholders::_1);
   }
 
   try
   {
     engine->ForceUpdateCheck(updateCheckDoneCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniGetElementHidingSelectors(JNIEnv* env, jclass clazz,
@@ skipping 103 matching lines @@
   CATCH_AND_THROW(env)
 }
 
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(J)J", (void*)JniCtor },
   { (char*)"isFirstRun", (char*)"(J)Z", (void*)JniIsFirstRun },
   { (char*)"getFilter", (char*)"(JLjava/lang/String;)" TYP("Filter"), (void*)JniGetFilter },
   { (char*)"getListedFilters", (char*)"(J)Ljava/util/List;", (void*)JniGetListedFilters },
   { (char*)"getSubscription", (char*)"(JLjava/lang/String;)" TYP("Subscription"), (void*)JniGetSubscription },
-  { (char*)"getNextNotificationToShow", (char*)"(JLjava/lang/String;)" TYP("Notification"), (void*)JniGetNextNotificationToShow },
+  { (char*)"showNextNotification", (char*)"(JLjava/lang/String;)V", (void*)JniShowNextNotification },
+  { (char*)"setShowNotificationCallback", (char*)"(JJ)V", (void*)JniSetShowNotificationCallback },
+  { (char*)"removeShowNotificationCallback", (char*)"(J)V", (void*)JniRemoveShowNotificationCallback },
   { (char*)"getListedSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniGetListedSubscriptions },
   { (char*)"fetchAvailableSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniFetchAvailableSubscriptions },
   { (char*)"setUpdateAvailableCallback", (char*)"(JJ)V", (void*)JniSetUpdateAvailableCallback },
   { (char*)"removeUpdateAvailableCallback", (char*)"(J)V", (void*)JniRemoveUpdateAvailableCallback },
   { (char*)"setFilterChangeCallback", (char*)"(JJ)V", (void*)JniSetFilterChangeCallback },
   { (char*)"removeFilterChangeCallback", (char*)"(J)V", (void*)JniRemoveFilterChangeCallback },
   { (char*)"forceUpdateCheck", (char*)"(JJ)V", (void*)JniForceUpdateCheck },
   { (char*)"getElementHidingSelectors", (char*)"(JLjava/lang/String;)Ljava/util/List;", (void*)JniGetElementHidingSelectors },
   { (char*)"matches", (char*)"(JLjava/lang/String;" TYP("FilterEngine$ContentType") "Ljava/lang/String;)" TYP("Filter"), (void*)JniMatches },
   { (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]));
 }