Issue 5309 - Subscriptions update causes ANR

libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

Index: libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java
diff --git a/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java b/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java
index 6e90006e8daf1c86dcdb9d10f970bfbf7a3938f9..b577536c0b8ed5082225635c854dadc3037e094d 100644
--- a/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java
+++ b/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java
@@ -196,6 +196,16 @@ public final class FilterEngine implements Disposable
     return getAcceptableAdsSubscriptionURL(this.ptr);
   }
 
+  /**
+   * Schedules updating of a subscription corresponding to the passed URL.
+   * @param subscriptionUrl may contain query parameters, only the beginning of the string is used
+   *                       to find a corresponding subscription.
+   */
+  public void updateFiltersAsync(String subscriptionUrl)

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

i don't like the idea of having 'Subscription.updateFilters()' but
'FilterEngine.updateFiltersAsync()' as it looks inconsistent.
Since subscription is created by FilterEngine in JniFilterEngine.cpp we can hold
a reference to FilterEngine instance in Subscription instance and have
'Subscription.updateFiltersAsync()'. Also all subscriptions are released before
FilterEngine is released so it seems to be not significant change here. A other
benefit is we will not have to iterate over all subscriptions and check if URL
matches.

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

When the request is intercepted there is no subscription object, there is only
an URL, so we will have to iterate through subscriptions anyway. Adding in
addition some JniSubscription which holds FilterEnginePtr does not look as a
good idea because I think subscription should not have a reference to
FilterEngine and that change will cause also some other changes (recall that
there is the weird cast Subscritpion* to JsValue* in the current code). I think
that it's fine to have such inconsistency, and since I also don't find
'Subscription.updateFilters()' good, maybe it makes sense to rather change the
rest API later.

[anton, 2017/06/16 11:25:12]

Acknowledged.

+  {
+    updateFiltersAsync(this.ptr, subscriptionUrl);
+  }
+
   @Override
   public void dispose()
   {
@@ -276,5 +286,7 @@ public final class FilterEngine implements Disposable
 
   private final static native String getAcceptableAdsSubscriptionURL(long ptr);
 
+  private final static native void updateFiltersAsync(long ptr, String subscriptionUrl);
+
   private final static native void dtor(long ptr);
 }