Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background

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 Runnable engineCreatedCallback = new Runnable()

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

maybe declare it final?

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

Acknowledged.

+  private final Runnable engineCreatedCallback = new Runnable()
   {
     @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.

+        // 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());
 
         // 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 Runnable engineDisposedCallback = new Runnable()

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

maybe declare it final?

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

Acknowledged.

+  private final Runnable engineDisposedCallback = new Runnable()
   {
     @Override
     public void run()
     {
       Log.d(TAG, "Releasing adblock settings storage");
       storage = null;
     }
   };
 
   // singleton
@@ skipping 64 matching lines @@
   private void initStorage(Context context, String settingsPreferenceName)
   {
     // read and apply current settings
     SharedPreferences settingsPrefs = context.getSharedPreferences(
       settingsPreferenceName,
       Context.MODE_PRIVATE);
 
     storage = new SharedPrefsStorage(settingsPrefs);
   }
 
-  // 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.

-
+  /**
+   * @deprecated The method is deprecated: use .getProvider().retain() instead
+   */
   @Deprecated
   public boolean retain(boolean asynchronous)
   {
     return provider.retain(asynchronous);
   }
 
+  /**
+   * @deprecated The method is deprecated: use .getProvider().waitForReady() instead
+   */
   @Deprecated
   public void waitForReady()
   {
     provider.waitForReady();
   }
 
+  /**
+   * @deprecated The method is deprecated: use .getProvider().getEngine() instead
+   */
   @Deprecated
   public AdblockEngine getEngine()
   {
     return provider.getEngine();
   }
 
+  /**
+   * @deprecated The method is deprecated: use .getProvider().release() instead
+   */
   @Deprecated
   public boolean release()
   {
     return provider.release();
   }
 
+  /**
+   * @deprecated The method is deprecated: use .getProvider().getCounter() instead
+   */
   @Deprecated
   public int getCounter()
   {
     return provider.getCounter();
   }
 }