Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java

Index: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
diff --git a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
index 965bafcbc97203707c19a503e44d02894808da06..9e6015b202cd8c50de372fe0063d4d4caf3ee041 100644
--- a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
+++ b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
@@ -19,18 +19,13 @@ package org.adblockplus.libadblockplus.android.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
 import android.util.Log;
 
-import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
 import org.adblockplus.libadblockplus.android.AdblockEngine;
-import org.adblockplus.libadblockplus.android.AndroidWebRequestResourceWrapper;
+import org.adblockplus.libadblockplus.android.AdblockEngineProvider;
+import org.adblockplus.libadblockplus.android.SingleInstanceEngineProvider;
 import org.adblockplus.libadblockplus.android.Utils;
 
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * AdblockHelper shared resources
  * (singleton)
@@ -50,23 +45,48 @@ public class AdblockHelper
   public static final String PRELOAD_PREFERENCE_NAME = "ADBLOCK_PRELOAD";
   private static AdblockHelper _instance;
 
-  private Context context;
-  private String basePath;
-  private boolean developmentBuild;
-  private String settingsPreferenceName;
-  private String preloadedPreferenceName;
-  private Map<String, Integer> urlToResourceIdMap;
-  private AdblockEngine engine;
+  private SingleInstanceEngineProvider provider;
   private AdblockSettingsStorage storage;
-  private CountDownLatch engineCreated;
-  private Long v8IsolateProviderPtr;
 
-  /*
-    Simple ARC management for AdblockEngine
-    Use `retain` and `release`
-   */
+  private Runnable engineCreatedCallback = new Runnable()

[diegocarloslima, 2018/01/19 12:17:45]

maybe declare it final?

[anton, 2018/01/19 12:27:01]

Acknowledged.

+  {
+    @Override
+    public void run()
+    {
+      AdblockSettings settings = storage.load();
+      if (settings != null)
+      {
+        Log.d(TAG, "Applying saved adblock settings to adblock engine");
+        // apply last saved settings to adblock engine
+

[jens, 2018/01/19 09:54:44]

Do wen need that empty line?

[anton, 2018/01/19 10:15:10]

it's just [optional] separation between comments (i can remove it and put "." at
the end of 1st comment)

[jens, 2018/01/19 10:22:43]

I would say that's up to you. I was just not sure if it was intentional.

[diegocarloslima, 2018/01/19 12:17:46]

for me it looks a bit weird this new line between 2 comments. I would prefer the
'.' option

[anton, 2018/01/19 12:27:01]

Acknowledged.

+        // all the settings except `enabled` and whitelisted domains list
+        // are saved by adblock engine itself
+        provider.getEngine().setEnabled(settings.isAdblockEnabled());
+        provider.getEngine().setWhitelistedDomains(settings.getWhitelistedDomains());
+
+        // allowed connection type is saved by filter engine but we need to override it
+        // as filter engine can be not created when changing
+        String connectionType = (settings.getAllowedConnectionType() != null
+          ? settings.getAllowedConnectionType().getValue()
+          : null);
+        provider.getEngine().getFilterEngine().setAllowedConnectionType(connectionType);
+      }
+      else
+      {
+        Log.w(TAG, "No saved adblock settings");
+      }
+    }
+  };
 
-  private AtomicInteger referenceCounter = new AtomicInteger(0);
+  private Runnable engineDisposedCallback = new Runnable()

[diegocarloslima, 2018/01/19 12:17:46]

maybe declare it final?

[anton, 2018/01/19 12:27:01]

Acknowledged.

+  {
+    @Override
+    public void run()
+    {
+      Log.d(TAG, "Releasing adblock settings storage");
+      storage = null;
+    }
+  };
 
   // singleton
   protected AdblockHelper()
@@ -88,13 +108,21 @@ public class AdblockHelper
     return _instance;
   }
 
-  public AdblockEngine getEngine()
+  public AdblockEngineProvider getProvider()
   {
-    return engine;
+    if (provider == null)
+    {
+      throw new IllegalStateException("Usage exception: call init(...) first");
+    }
+    return provider;
   }
 
   public AdblockSettingsStorage getStorage()
   {
+    if (storage == null)
+    {
+      throw new IllegalStateException("Usage exception: call init(...) first");
+    }
     return storage;
   }
 
@@ -110,209 +138,60 @@ public class AdblockHelper
    * @param developmentBuild debug or release?
    * @param preferenceName Shared Preferences name to store adblock settings
    */
-  public AdblockHelper init(Context context, String basePath,
-                            boolean developmentBuild, String preferenceName)
+  public SingleInstanceEngineProvider init(Context context, String basePath,
+                                           boolean developmentBuild, String preferenceName)
   {
-    this.context = context.getApplicationContext();
-    this.basePath = basePath;
-    this.developmentBuild = developmentBuild;
-    this.settingsPreferenceName = preferenceName;
-    return this;
+    initProvider(context, basePath, developmentBuild);
+    initStorage(context, preferenceName);
+    return provider;
   }
 
-  /**
-   * Use preloaded subscriptions
-   * @param preferenceName Shared Preferences name to store intercepted requests stats
-   * @param urlToResourceIdMap
-   */
-  public AdblockHelper preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
+  private void initProvider(Context context, String basePath, boolean developmentBuild)
   {
-    this.preloadedPreferenceName = preferenceName;
-    this.urlToResourceIdMap = urlToResourceIdMap;
-    return this;
+    provider = new SingleInstanceEngineProvider(context, basePath, developmentBuild);
+    provider.setEngineCreatedCallback(engineCreatedCallback);
+    provider.setEngineDisposedCallback(engineDisposedCallback);
   }
 
-  public AdblockHelper useV8IsolateProvider(long ptr)
+  private void initStorage(Context context, String settingsPreferenceName)
   {
-    this.v8IsolateProviderPtr = ptr;
-    return this;
-  }
-
-  private void createAdblock()
-  {
-    ConnectivityManager connectivityManager =
-      (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    IsAllowedConnectionCallback isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(connectivityManager);
-
-    Log.d(TAG, "Creating adblock engine ...");
-
     // read and apply current settings
     SharedPreferences settingsPrefs = context.getSharedPreferences(
       settingsPreferenceName,
       Context.MODE_PRIVATE);
-    storage = new SharedPrefsStorage(settingsPrefs);
-
-    AdblockEngine.Builder builder = AdblockEngine
-      .builder(
-        AdblockEngine.generateAppInfo(context, developmentBuild),
-        basePath)
-      .setIsAllowedConnectionCallback(isAllowedConnectionCallback)
-      .enableElementHiding(true);
-
-    if (v8IsolateProviderPtr != null)
-    {
-      builder.useV8IsolateProvider(v8IsolateProviderPtr);
-    }
-
-    // if preloaded subscriptions provided
-    if (preloadedPreferenceName != null)
-    {
-      SharedPreferences preloadedSubscriptionsPrefs = context.getSharedPreferences(
-        preloadedPreferenceName,
-        Context.MODE_PRIVATE);
-      builder.preloadSubscriptions(
-        context,
-        urlToResourceIdMap,
-        new AndroidWebRequestResourceWrapper.SharedPrefsStorage(preloadedSubscriptionsPrefs));
-    }
 
-    engine = builder.build();
-
-    Log.d(TAG, "AdblockHelper engine created");
-
-    AdblockSettings settings = storage.load();
-    if (settings != null)
-    {
-      Log.d(TAG, "Applying saved adblock settings to adblock engine");
-      // apply last saved settings to adblock engine
-
-      // all the settings except `enabled` and whitelisted domains list
-      // are saved by adblock engine itself
-      engine.setEnabled(settings.isAdblockEnabled());
-      engine.setWhitelistedDomains(settings.getWhitelistedDomains());
-
-      // allowed connection type is saved by filter engine but we need to override it
-      // as filter engine can be not created when changing
-      String connectionType = (settings.getAllowedConnectionType() != null
-       ? settings.getAllowedConnectionType().getValue()
-       : null);
-      engine.getFilterEngine().setAllowedConnectionType(connectionType);
-    }
-    else
-    {
-      Log.w(TAG, "No saved adblock settings");
-    }
+    storage = new SharedPrefsStorage(settingsPrefs);
   }
 
-  /**
-   * Wait until everything is ready (used for `retain(true)`)
-   * Warning: locks current thread
-   */
-  public void waitForReady()
-  {
-    if (engineCreated == null)
-    {
-      throw new RuntimeException("AdblockHelper Plus usage exception: call retain(true) first");
-    }
+  // The methods below are deprecated: use .getProvider().method() instead

[diegocarloslima, 2018/01/19 12:17:45]

This comment would be better inside the javadoc part of each method

[anton, 2018/01/19 12:27:01]

Acknowledged.

 
-    try
-    {
-      Log.d(TAG, "Waiting for ready ...");
-      engineCreated.await();
-      Log.d(TAG, "Ready");
-    }
-    catch (InterruptedException e)
-    {
-      Log.w(TAG, "Interrupted", e);
-    }
+  @Deprecated
+  public boolean retain(boolean asynchronous)
+  {
+    return provider.retain(asynchronous);
   }
 
-  private void disposeAdblock()
+  @Deprecated
+  public void waitForReady()
   {
-    Log.w(TAG, "Disposing adblock engine");
-
-    engine.dispose();
-    engine = null;
-
-    storage = null;
+    provider.waitForReady();
   }
 
-  /**
-   * Get registered clients count
-   * @return registered clients count
-   */
-  public int getCounter()
+  @Deprecated
+  public AdblockEngine getEngine()
   {
-    return referenceCounter.get();
+    return provider.getEngine();
   }
 
-  /**
-   * Register AdblockHelper engine client
-   * @param asynchronous If `true` engines will be created in background thread without locking of
-   *                     current thread. Use waitForReady() before getEngine() later.
-   *                     If `false` locks current thread.
-   * @return if a new instance is allocated
-   */
-  public synchronized boolean retain(boolean asynchronous)
+  @Deprecated
+  public boolean release()
   {
-    boolean firstInstance = false;
-
-    if (referenceCounter.getAndIncrement() == 0)
-    {
-      firstInstance = true;
-
-      if (!asynchronous)
-      {
-        createAdblock();
-      }
-      else
-      {
-        // latch is required for async (see `waitForReady()`)
-        engineCreated = new CountDownLatch(1);
-
-        new Thread(new Runnable()
-        {
-          @Override
-          public void run()
-          {
-            createAdblock();
-
-            // unlock waiting client thread
-            engineCreated.countDown();
-          }
-        }).start();
-      }
-    }
-    return firstInstance;
+    return provider.release();
   }
 
-  /**
-   * Unregister AdblockHelper engine client
-   * @return `true` if the last instance is destroyed
-   */
-  public synchronized boolean release()
+  @Deprecated
+  public int getCounter()
   {
-    boolean lastInstance = false;
-
-    if (referenceCounter.decrementAndGet() == 0)
-    {
-      lastInstance = true;
-
-      if (engineCreated != null)
-      {
-        // retained asynchronously
-        waitForReady();
-        disposeAdblock();
-
-        // to unlock waiting client in waitForReady()
-        engineCreated.countDown();
-        engineCreated = null;
-      }
-      else
-      {
-        disposeAdblock();
-      }
-    }
-    return lastInstance;
+    return provider.getCounter();
   }
 }