Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background

libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/MainActivity.java

 /*
  * 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 22 matching lines @@
 import android.widget.EditText;
 import android.widget.ProgressBar;
 
 public class MainActivity extends Activity
 {
   public static final boolean DEVELOPMENT_BUILD = true;
 
   // webView can create AdblockEngine instance itself if not passed with `webView.setAdblockEngine()`
   public static final boolean USE_EXTERNAL_ADBLOCKENGINE = true;
 
-  // adblock retain() may be long-running, pass `true` to do it in background thread
-  public static final boolean ADBLOCKENGINE_RETAIN_ASYNC = true;
-
   private ProgressBar progress;
   private EditText url;
   private Button ok;
   private Button back;
   private Button forward;
   private Button settings;
 
   private AdblockWebView webView;
 
   @Override
@@ skipping 138 matching lines @@
 
   private void navigateSettings()
   {
     startActivity(new Intent(this, SettingsActivity.class));
   }
 
   private void initAdblockWebView()
   {
     if (USE_EXTERNAL_ADBLOCKENGINE)
     {
-      // external adblockEngine
-      AdblockHelper.get().retain(ADBLOCKENGINE_RETAIN_ASYNC);
-
-      if (!ADBLOCKENGINE_RETAIN_ASYNC)
-      {
-        webView.setAdblockEngine(AdblockHelper.get().getEngine());
-      }
+      // external AdblockEngine
+      webView.setProvider(AdblockHelper.get().getProvider());
     }
     else
     {
       // AdblockWebView will create internal AdblockEngine instance
     }
   }
 
   private void hideSoftwareKeyboard()
   {
     InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
@@ skipping 23 matching lines @@
     if (!url.startsWith("http"))
       url = "http://" + url;
 
     // make sure url is valid URL
     return url;
   }
 
   private void loadUrl()
   {
     hideSoftwareKeyboard();
-
-    // if retained with `true` we need to make sure it's ready now
-    if (USE_EXTERNAL_ADBLOCKENGINE && ADBLOCKENGINE_RETAIN_ASYNC)
-    {
-      AdblockHelper.get().waitForReady();
-      webView.setAdblockEngine(AdblockHelper.get().getEngine());
-    }
     webView.loadUrl(prepareUrl(url.getText().toString()));
   }
 
   @Override
   protected void onDestroy()
   {
-    webView.dispose(new Runnable()
-    {
-      @Override
-      public void run()
-      {
-        if (USE_EXTERNAL_ADBLOCKENGINE)
-        {
-          AdblockHelper.get().release();
-        }
-      }
-    });
+    webView.dispose(null);
 
     super.onDestroy();
   }
 }