Issue 6307 - Introduce external engine created callback

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.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 30 matching lines @@
 
   /**
    * Suggested preference name to store intercepted subscription requests
    */
   public static final String PRELOAD_PREFERENCE_NAME = "ADBLOCK_PRELOAD";
   private static AdblockHelper _instance;
 
   private SingleInstanceEngineProvider provider;
   private AdblockSettingsStorage storage;
 
-  private final Runnable engineCreatedCallback = new Runnable()

[anton, 2018/01/24 12:50:05]

We could accept Runnable in some `AdblockHelper` method and fire it after this
one is fired.
But since we already have callback in `SingleInstanceEngineProvider`, i
preferred to convert callback ref to list
of callbacks instead.

+  private final SingleInstanceEngineProvider.EngineCreatedListener engineCreatedListener =
+    new SingleInstanceEngineProvider.EngineCreatedListener()
   {
     @Override
-    public void run()
+    public void onAdblockEngineCreated(AdblockEngine engine)
     {
       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
-        provider.getEngine().setEnabled(settings.isAdblockEnabled());
-        provider.getEngine().setWhitelistedDomains(settings.getWhitelistedDomains());
+        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);
-        provider.getEngine().getFilterEngine().setAllowedConnectionType(connectionType);
+        engine.getFilterEngine().setAllowedConnectionType(connectionType);
       }
       else
       {
         Log.w(TAG, "No saved adblock settings");
       }
     }
   };
 
-  private final Runnable engineDisposedCallback = new Runnable()
+  private final SingleInstanceEngineProvider.EngineDisposedListener engineDisposedListener =
+    new SingleInstanceEngineProvider.EngineDisposedListener()
   {
     @Override
-    public void run()
+    public void onAdblockEngineDisposed()
     {
       Log.d(TAG, "Releasing adblock settings storage");
       storage = null;
     }
   };
 
   // singleton
   protected AdblockHelper()
   {
     // prevents instantiation
@@ skipping 47 matching lines @@
                                            boolean developmentBuild, String preferenceName)
   {
     initProvider(context, basePath, developmentBuild);
     initStorage(context, preferenceName);
     return provider;
   }
 
   private void initProvider(Context context, String basePath, boolean developmentBuild)
   {
     provider = new SingleInstanceEngineProvider(context, basePath, developmentBuild);
-    provider.addEngineCreatedCallback(engineCreatedCallback);
-    provider.addEngineDisposedCallback(engineDisposedCallback);
+    provider.addEngineCreatedListener(engineCreatedListener);
+    provider.addEngineDisposedListener(engineDisposedListener);
   }
 
   private void initStorage(Context context, String settingsPreferenceName)
   {
     // read and apply current settings
     SharedPreferences settingsPrefs = context.getSharedPreferences(
       settingsPreferenceName,
       Context.MODE_PRIVATE);
 
     storage = new SharedPrefsStorage(settingsPrefs);
@@ skipping 37 matching lines @@
 
   /**
    * @deprecated The method is deprecated: use .getProvider().getCounter() instead
    */
   @Deprecated
   public int getCounter()
   {
     return provider.getCounter();
   }
 }