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 186 matching lines @@
     {
       androidWebRequest = new AndroidWebRequest(engine.elemhideEnabled, true);
       engine.webRequest = androidWebRequest;
 
       if (urlToResourceIdMap != null)
       {
         AndroidWebRequestResourceWrapper wrapper = new AndroidWebRequestResourceWrapper(
           context, engine.webRequest, urlToResourceIdMap, resourceStorage);
         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)
+            if (engine.filterEngine != null)
             {
-              this.adblockEngine.filterEngine.updateFiltersAsync(url);
+              engine.filterEngine.updateFiltersAsync(url);
             }
           }
-        }.init(this.engine));
+        });
 
         engine.webRequest = wrapper;
       }
     }
 
     private void initCallbacks()
     {
       if (engine.updateAvailableCallback != null)
       {
         engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
@@ skipping 405 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }