Issue 5286 - Update to use libadblockplus rev. b88d098aeab5

libadblockplus-android/jni/JniFilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <AdblockPlus.h>
 #include "Utils.h"
 #include "JniCallbacks.h"
+#include <thread>
 
 static jobject SubscriptionsToArrayList(JNIEnv* env, std::vector<AdblockPlus::Subscription>&& subscriptions)
 {
   jobject list = NewJniArrayList(env);
 
   for (std::vector<AdblockPlus::Subscription>::iterator it = subscriptions.begin(), end = subscriptions.end(); it != end; it++)
   {
     JniAddObjectToList(env, list, NewJniSubscription(env, std::move(*it)));
   }
 
@@ skipping 19 matching lines @@
   {
     AdblockPlus::JsEnginePtr& jsEngine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(jsEnginePtr);
     AdblockPlus::FilterEnginePtr* filterEngine = NULL;
 
     if (isAllowedConnectionCallbackPtr != 0)
     {
       AdblockPlus::FilterEngine::CreationParameters creationParameters;
       JniIsAllowedConnectionTypeCallback* callback =
         JniLongToTypePtr<JniIsAllowedConnectionTypeCallback>(isAllowedConnectionCallbackPtr);
 
-      AdblockPlus::FilterEngine::IsConnectionAllowedCallback cppCallback =
-        std::bind(&JniIsAllowedConnectionTypeCallback::Callback, callback, std::placeholders::_1);
-      creationParameters.isConnectionAllowedCallback = cppCallback;
+      creationParameters.isSubscriptionDowloadAllowedCallback =
+        [callback](const std::string* allowedConnectionTypeArg, const std::function<void(bool)>& doneCallback)
+      {
+        std::shared_ptr<std::string> allowedConnectionType;
+        if (allowedConnectionTypeArg)

[anton, 2017/06/02 06:55:23]

"{" required

[sergei, 2017/06/02 07:32:43]

Done.

+          allowedConnectionType = std::make_shared<std::string>(*allowedConnectionTypeArg);
+        std::thread([callback, allowedConnectionType, doneCallback]

[sergei, 2017/06/01 14:41:57]

Detached thread is still a hack with data race, basically it was the same before
but in libadblockplus. I expect it to be fixed after #5179 and #5198.

[anton, 2017/06/02 06:55:23]

"}" required

[sergei, 2017/06/02 07:32:43]

Done.

+        {
+          doneCallback(callback->Callback(allowedConnectionType.get()));
+        }).detach();
+      };
 
       filterEngine = new AdblockPlus::FilterEnginePtr(
         AdblockPlus::FilterEngine::Create(jsEngine, creationParameters));
     }
     else
     {
       filterEngine = new AdblockPlus::FilterEnginePtr(
         AdblockPlus::FilterEngine::Create(jsEngine));
     }
 
@@ skipping 472 matching lines @@
   { (char*)"setAcceptableAdsEnabled", (char*)"(JZ)V", (void*)JniSetAcceptableAdsEnabled },
   { (char*)"isAcceptableAdsEnabled", (char*)"(J)Z", (void*)JniIsAcceptableAdsEnabled },
   { (char*)"getAcceptableAdsSubscriptionURL", (char*)"(J)Ljava/lang/String;", (void*)JniGetAcceptableAdsSubscriptionURL },
   { (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]));
 }