Issue 7035 - Update libadblockplus dependency

adblock-android/jni/JniFilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 156 matching lines @@
 {
   AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
     return SubscriptionsToArrayList(env, engine.FetchAvailableSubscriptions());
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
-static void JNICALL JniRemoveUpdateAvailableCallback(JNIEnv* env, jclass clazz,
-                                                     jlong ptr)
-{
-  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
-  try
-  {
-    engine.RemoveUpdateAvailableCallback();
-  }
-  CATCH_AND_THROW(env)
-}
-
-static void JNICALL JniSetUpdateAvailableCallback(JNIEnv* env, jclass clazz,
-                                                  jlong ptr, jlong callbackPtr)
-{
-  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
-  JniUpdateAvailableCallback* const callback =
-      JniLongToTypePtr<JniUpdateAvailableCallback>(callbackPtr);
-
-  const AdblockPlus::FilterEngine::UpdateAvailableCallback updateAvailableCallback =
-      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 = GetFilterEngineRef(ptr);
 
   try
   {
     engine.RemoveFilterChangeCallback();
   }
   CATCH_AND_THROW(env)
 }
@@ skipping 10 matching lines @@
     callback->Callback(arg, std::move(jsValue));
   };
 
   try
   {
     engine.SetFilterChangeCallback(filterCallback);
   }
   CATCH_AND_THROW(env)
 }
 
-static void JNICALL JniForceUpdateCheck(JNIEnv* env, jclass clazz, jlong ptr, jlong updaterPtr)
-{
-  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
-  JniUpdateCheckDoneCallback* callback =
-      JniLongToTypePtr<JniUpdateCheckDoneCallback>(updaterPtr);
-
-  AdblockPlus::FilterEngine::UpdateCheckDoneCallback
-      updateCheckDoneCallback = 0;
-
-  if (updaterPtr)
-  {
-    updateCheckDoneCallback =
-        std::bind(&JniUpdateCheckDoneCallback::Callback, callback,
-                       std::placeholders::_1);
-  }
-
-  try
-  {
-    engine.ForceUpdateCheck(updateCheckDoneCallback);
-  }
-  CATCH_AND_THROW(env)
-}
-
 static jobject JNICALL JniGetElementHidingSelectors(JNIEnv* env, jclass clazz,
     jlong ptr, jstring jDomain)
 {
   AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string domain = JniJavaToStdString(env, jDomain);
 
   try
   {
     std::vector<std::string> selectors = engine.GetElementHidingSelectors(
@@ skipping 245 matching lines @@
 {
   { (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*)"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*)"isDocumentWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsDocumentWhitelisted },
   { (char*)"isElemhideWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsElemhideWhitelisted },
   { (char*)"getPref", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetPref },
   { (char*)"setPref", (char*)"(JLjava/lang/String;J)V", (void*)JniSetPref },
   { (char*)"getHostFromURL", (char*)"(JLjava/lang/String;)Ljava/lang/String;", (void*)JniGetHostFromURL },
   { (char*)"setAllowedConnectionType", (char*)"(JLjava/lang/String;)V", (void*)JniSetAllowedConnectionType },
   { (char*)"getAllowedConnectionType", (char*)"(J)Ljava/lang/String;", (void*)JniGetAllowedConnectionType },
   { (char*)"setAcceptableAdsEnabled", (char*)"(JZ)V", (void*)JniSetAcceptableAdsEnabled },
   { (char*)"isAcceptableAdsEnabled", (char*)"(J)Z", (void*)JniIsAcceptableAdsEnabled },
   { (char*)"getAcceptableAdsSubscriptionURL", (char*)"(J)Ljava/lang/String;", (void*)JniGetAcceptableAdsSubscriptionURL },
   { (char*)"updateFiltersAsync", (char*)"(JLjava/lang/String;)V", (void*)JniUpdateFiltersAsync },
   { (char*)"getNativePtr", (char*)"(J)J", (void*)JniGetFilterEngineNativePtr }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }