Issue 5309 - Subscriptions update causes ANR

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

 /*
  * 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 184 matching lines @@
 
     private void initRequests()
     {
       androidWebRequest = new AndroidWebRequest(engine.elemhideEnabled, true);
       engine.webRequest = androidWebRequest;
 
       if (urlToResourceIdMap != null)
       {
         AndroidWebRequestResourceWrapper wrapper = new AndroidWebRequestResourceWrapper(
           context, engine.webRequest, urlToResourceIdMap, resourceStorage);
-        wrapper.setListener(engine.resourceWrapperListener);
+        wrapper.setListener(new AndroidWebRequestResourceWrapper.Listener()
+        {
+          private AdblockEngine adblockEngine;
+
+          AndroidWebRequestResourceWrapper.Listener init(AdblockEngine adblockEngine)
+          {
+            this.adblockEngine = adblockEngine;
+            return this;
+          }
+
+          @Override
+          public void onIntercepted(String url, int resourceId)
+          {
+            Log.d(TAG, "Force subscription update for intercepted URL " + url);
+            if (this.adblockEngine.filterEngine != null)
+            {
+              this.adblockEngine.filterEngine.updateFiltersAsync(url);
+            }
+          }
+        }.init(this.engine));
 
         engine.webRequest = wrapper;
       }
     }
 
     private void initCallbacks()
     {
       if (engine.updateAvailableCallback != null)
       {
         engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
@@ skipping 36 matching lines @@
 
       engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectionCallback);
     }
   }
 
   public static Builder builder(AppInfo appInfo, String basePath)
   {
     return new Builder(appInfo, basePath);
   }
 
-  private final AndroidWebRequestResourceWrapper.Listener resourceWrapperListener =
-    new AndroidWebRequestResourceWrapper.Listener()
-  {
-    private static final int UPDATE_DELAY_MS = 1 * 1000;
-
-    private final Handler handler = new Handler(Looper.getMainLooper());
-
-    private final Runnable forceUpdateRunnable = new Runnable()
-    {
-      public void run() {
-        // Filter Engine can be already disposed
-        if (filterEngine != null)
-        {
-          Log.d(TAG, "Force update subscriptions");
-          AdblockEngine.this.updateSubscriptions();
-        }
-      }
-    };
-
-    @Override
-    public void onIntercepted(String url, int resourceId)
-    {
-      // we need to force update subscriptions ASAP after preloaded one is returned
-      // but we should note that multiple interceptions (for main easylist and AA) and force update once only
-
-      // adding into main thread queue to avoid concurrency issues (start update while updating)
-      // as usually onIntercepted() is invoked in background thread
-      handler.removeCallbacks(forceUpdateRunnable);
-      handler.postDelayed(forceUpdateRunnable, UPDATE_DELAY_MS);
-
-      Log.d(TAG, "Scheduled force update in " + UPDATE_DELAY_MS);
-    }
-  };
-
   public void dispose()
   {
     Log.w(TAG, "Dispose");
 
     // engines first
     if (this.filterEngine != null)
     {
       if (this.updateAvailableCallback != null)
       {
         this.filterEngine.removeUpdateAvailableCallback();
@@ skipping 182 matching lines @@
           sub.addToList();
         }
         finally
         {
           sub.dispose();
         }
       }
     }
   }
 
-  public void updateSubscriptions()
-  {
-    for (final Subscription s : this.filterEngine.getListedSubscriptions())
-    {
-      try
-      {
-        s.updateFilters();
-      }
-      finally
-      {
-        s.dispose();
-      }
-    }
-  }
-
   public void setEnabled(final boolean enabled)
   {
     this.enabled = enabled;
   }
 
   public boolean isEnabled()
   {
     return enabled;
   }
 
@@ skipping 147 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }