Issue 5572 - reduce the probability of the race condition while updating of preloaded subscriptions

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 467 matching lines @@
     std::string url = engine.GetAAUrl();
     return JniStdStringToJava(env, url);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniUpdateFiltersAsync(JNIEnv* env, jclass clazz, jlong jniPlatformPtr, jstring jSubscriptionUrl)
 {
   std::string subscriptionUrl = JniJavaToStdString(env, jSubscriptionUrl);
   auto jniPlatform = JniLongToTypePtr<JniPlatform>(jniPlatformPtr);
-  jniPlatform->scheduler([jniPlatform, subscriptionUrl]
+  auto updateSubscriptionFilters = [jniPlatform, subscriptionUrl]
   {
     auto& filterEngine = jniPlatform->platform->GetFilterEngine();
     for (auto& subscription : filterEngine.GetListedSubscriptions())
     {
       if (stringBeginsWith(subscriptionUrl, subscription.GetProperty("url").AsString()))
       {
         subscription.UpdateFilters();
         return;
       }
     }
+  };
+  jniPlatform->platform->WithTimer([updateSubscriptionFilters](AdblockPlus::ITimer& timer)
+  {
+    timer.SetTimer(std::chrono::milliseconds(300), updateSubscriptionFilters);

[anton, 2017/10/06 10:38:08]

I don't like such timers a lot. It's always introduces hard reproduceable cases
and extremely hard to find and fix. Does this
(https://issues.adblockplus.org/ticket/5572#comment:12) help?

[sergei, 2017/10/06 13:37:03]

As discussed in the issue, it does not help.

   });
 }
 
 static JNINativeMethod methods[] =
 {
   { (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 },
@@ skipping 19 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*)"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]));
 }