Issue 6307 - Introduce external engine created callback

libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.libadblockplus.android.webviewapp;
 
 import android.content.Context;
 
-import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.android.AdblockEngine;
 import org.adblockplus.libadblockplus.android.AndroidWebRequestResourceWrapper;
+import org.adblockplus.libadblockplus.android.SingleInstanceEngineProvider;
 import org.adblockplus.libadblockplus.android.settings.AdblockHelper;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class Application extends android.app.Application
 {
-  private final Runnable onAdblockEngineCreated = new Runnable()
+  private final SingleInstanceEngineProvider.EngineCreatedListener engineCreatedListener =
+    new SingleInstanceEngineProvider.EngineCreatedListener()
   {
     @Override
-    public void run()
+    public void onAdblockEngineCreated(AdblockEngine engine)
     {
-      FilterEngine engine = AdblockHelper.get().getProvider().getEngine().getFilterEngine();
       // put your Adblock FilterEngine init here
     }
   };
 
-  private final Runnable onAdblockEngineDisposed = new Runnable()
+  private final SingleInstanceEngineProvider.EngineDisposedListener engineDisposedListener =
+    new SingleInstanceEngineProvider.EngineDisposedListener()
   {
     @Override
-    public void run()
+    public void onAdblockEngineDisposed()
     {
       // put your Adblock FilterEngine deinit here
     }
   };
 
   @Override
   public void onCreate()
   {
     super.onCreate();
 
     // init Adblock
     String basePath = getDir(AdblockEngine.BASE_PATH_DIRECTORY, Context.MODE_PRIVATE).getAbsolutePath();
 
     // provide preloaded subscriptions
     Map<String, Integer> map = new HashMap<String, Integer>();
     map.put(AndroidWebRequestResourceWrapper.EASYLIST, R.raw.easylist);
     map.put(AndroidWebRequestResourceWrapper.EASYLIST_CHINESE, R.raw.easylist);
     map.put(AndroidWebRequestResourceWrapper.ACCEPTABLE_ADS, R.raw.exceptionrules);
 
     AdblockHelper
       .get()
       .init(this, basePath, true, AdblockHelper.PREFERENCE_NAME)
       .preloadSubscriptions(AdblockHelper.PRELOAD_PREFERENCE_NAME, map)
-      .addEngineCreatedCallback(onAdblockEngineCreated)
-      .addEngineDisposedCallback(onAdblockEngineDisposed);
+      .addEngineCreatedListener(engineCreatedListener)
+      .addEngineDisposedListener(engineDisposedListener);
   }
 }