Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

libadblockplus-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 42 matching lines @@
     AdblockPlus::ITimer* timer;
     AdblockPlus::FilterEnginePtr filterEngine;
   };
 
   AdblockPlus::FilterEngine& GetFilterEngineRef(jlong ptr)
   {
     return *JniLongToTypePtr<JniFilterEngine>(ptr)->filterEngine;
   }
 }
 
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jniJsEnginePtr, jlong isAllowedConnectionCallbackPtr)
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jniJsEnginePtr, jobject jIsSubscriptionDownloadAllowedCallback)
 {
   try
   {
     auto jniJsEngine = JniLongToTypePtr<JniJsEngine>(jniJsEnginePtr);
     auto jsEngine = jniJsEngine->jsEngine;
     auto jniFilterEngine = new JniFilterEngine();
     jniFilterEngine->timer = jniJsEngine->timer;
 
-    if (isAllowedConnectionCallbackPtr != 0)
+    if (jIsSubscriptionDownloadAllowedCallback)
     {
       AdblockPlus::FilterEngine::CreationParameters creationParameters;
-      JniIsAllowedConnectionTypeCallback* callback =
-        JniLongToTypePtr<JniIsAllowedConnectionTypeCallback>(isAllowedConnectionCallbackPtr);
+      auto callback = std::make_shared<JniIsAllowedConnectionTypeCallback>(env, jIsSubscriptionDownloadAllowedCallback);
 
       creationParameters.isSubscriptionDownloadAllowedCallback =
         [callback](const std::string* allowedConnectionTypeArg, const std::function<void(bool)>& doneCallback)
       {
         std::shared_ptr<std::string> allowedConnectionType;
         if (allowedConnectionTypeArg)
         {
           allowedConnectionType = std::make_shared<std::string>(*allowedConnectionTypeArg);
         }
         std::thread([callback, allowedConnectionType, doneCallback]
@@ skipping 459 matching lines @@
       {
         subscription.UpdateFilters();
         return;
       }
     }
   });
 }
 
 static JNINativeMethod methods[] =
 {
-  { (char*)"ctor", (char*)"(JJ)J", (void*)JniCtor },
+  { (char*)"ctor", (char*)"(J" TYP("IsAllowedConnectionCallback") ")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*)"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 },
@@ skipping 15 matching lines @@
   { (char*)"isAcceptableAdsEnabled", (char*)"(J)Z", (void*)JniIsAcceptableAdsEnabled },
   { (char*)"getAcceptableAdsSubscriptionURL", (char*)"(J)Ljava/lang/String;", (void*)JniGetAcceptableAdsSubscriptionURL },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor },
   { (char*)"updateFiltersAsync", (char*)"(JLjava/lang/String;)V", (void*)JniUpdateFiltersAsync }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }