Issue 5309 - Subscriptions update causes ANR

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>
+#include "JniJsEngine.h"
 
 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)));
   }
 
   return list;
 }
 
 static AdblockPlus::FilterEngine::ContentType ConvertContentType(JNIEnv *env,
     jobject jContentType)
 {
   JniLocalReference<jclass> contentTypeClass(env,
       env->GetObjectClass(jContentType));
   jmethodID nameMethod = env->GetMethodID(*contentTypeClass, "name",
       "()Ljava/lang/String;");
   JniLocalReference<jstring> jValue(env,
       (jstring) env->CallObjectMethod(jContentType, nameMethod));
   const std::string value = JniJavaToStdString(env, *jValue);
   return AdblockPlus::FilterEngine::StringToContentType(value);
 }
 
 namespace
 {
+  struct JniFilterEngine
+  {
+    AdblockPlus::ITimer* timer;
+    AdblockPlus::FilterEnginePtr filterEngine;
+  };
+
   AdblockPlus::FilterEnginePtr& GetFilterEnginePtrRef(jlong ptr)
   {
-    return *JniLongToTypePtr<AdblockPlus::FilterEnginePtr>(ptr);
+    return JniLongToTypePtr<JniFilterEngine>(ptr)->filterEngine;
   }
 }
 
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jsEnginePtr, jlong isAllowedConnectionCallbackPtr)
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jniJsEnginePtr, jlong isAllowedConnectionCallbackPtr)
 {
   try
   {
-    AdblockPlus::JsEnginePtr& jsEngine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(jsEnginePtr);
-    AdblockPlus::FilterEnginePtr* filterEngine = NULL;
+    auto jniJsEngine = JniLongToTypePtr<JniJsEngine>(jniJsEnginePtr);
+    auto jsEngine = jniJsEngine->jsEngine;
+    auto jniFilterEngine = new JniFilterEngine();
+    jniFilterEngine->timer = jniJsEngine->timer;
 
     if (isAllowedConnectionCallbackPtr != 0)
     {
       AdblockPlus::FilterEngine::CreationParameters creationParameters;
       JniIsAllowedConnectionTypeCallback* callback =
         JniLongToTypePtr<JniIsAllowedConnectionTypeCallback>(isAllowedConnectionCallbackPtr);
 
       creationParameters.isSubscriptionDowloadAllowedCallback =
         [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]
         {
           doneCallback(callback->Callback(allowedConnectionType.get()));
         }).detach();
       };
 
-      filterEngine = new AdblockPlus::FilterEnginePtr(
-        AdblockPlus::FilterEngine::Create(jsEngine, creationParameters));
+      jniFilterEngine->filterEngine = AdblockPlus::FilterEngine::Create(jsEngine, creationParameters);
     }
     else
     {
-      filterEngine = new AdblockPlus::FilterEnginePtr(
-        AdblockPlus::FilterEngine::Create(jsEngine));
+      jniFilterEngine->filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
     }
 
-    return JniPtrToLong(filterEngine);
+    return JniPtrToLong(jniFilterEngine);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  delete JniLongToTypePtr<AdblockPlus::FilterEnginePtr>(ptr);
+  delete JniLongToTypePtr<JniFilterEngine>(ptr);
 }
 
 static jboolean JNICALL JniIsFirstRun(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
     AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
 
     return engine->IsFirstRun() ? JNI_TRUE : JNI_FALSE;
   }
@@ skipping 410 matching lines @@
 {
   try
   {
     AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
     std::string url = engine->GetAAUrl();
     return JniStdStringToJava(env, url);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
+static void JNICALL JniUpdateFiltersAsync(JNIEnv* env, jclass clazz, jlong ptr, jstring jSubscriptionUrl)
+{
+  std::string subscriptionUrl = JniJavaToStdString(env, jSubscriptionUrl);
+  auto jniFilterEngine = JniLongToTypePtr<JniFilterEngine>(ptr);
+  std::weak_ptr<AdblockPlus::FilterEngine> weakFilterEngine = jniFilterEngine->filterEngine;
+  jniFilterEngine->timer->SetTimer(std::chrono::milliseconds(0), [weakFilterEngine, subscriptionUrl]
+  {
+    auto filterEngine = weakFilterEngine.lock();
+    if (!filterEngine)

[anton, 2017/06/15 05:51:53]

"{" required here

[sergei, 2017/06/16 11:12:08]

Done.

+      return;
+    for (auto& subscription : filterEngine->GetListedSubscriptions())

[anton, 2017/06/15 05:51:53]

"}" required here

[sergei, 2017/06/16 11:12:08]

Done.

+    {
+      if (stringBeginsWith(subscriptionUrl, subscription.GetProperty("url").AsString()))
+      {
+        subscription.UpdateFilters();
+        return;
+      }
+    }
+  });
+}
+
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(JJ)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 },
@@ skipping 10 matching lines @@
   { (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*)"dtor", (char*)"(J)V", (void*)JniDtor }
+  { (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]));
 }