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
@@ skipping 354 matching lines @@
               *JniLocalReference<jstring>(env,
                   static_cast<jstring>(
                       env->GetObjectArrayElement(jArray, i)))));
     }
   }
 }
 
 static jobject JNICALL JniMatchesMany(JNIEnv* env, jclass clazz, jlong ptr,
     jstring jUrl, jobject jContentType, jobjectArray jDocumentUrls)
 {
-  AdblockPlus::FilterEnginePtr& engine =
-      GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   AdblockPlus::FilterEngine::ContentType contentType =
       ConvertContentType(env, jContentType);
 
   std::vector<std::string> documentUrls;
   JavaStringArrayToStringVector(env, jDocumentUrls, documentUrls);
 
   try
   {
@@ skipping 148 matching lines @@
 }
 
 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;
       }
     }
   });
 }
 
@@ skipping 28 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]));
 }