Issue 6001 - Pass IV8IsolateProvider to Helper

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 41 matching lines @@
 
   private Context context;
   private String basePath;
   private boolean developmentBuild;
   private String settingsPreferenceName;
   private String preloadedPreferenceName;
   private Map<String, Integer> urlToResourceIdMap;
   private AdblockEngine engine;
   private AdblockSettingsStorage storage;
   private CountDownLatch engineCreated;
-  private Long v8IsolatePtr;
+  private Long v8IsolateProviderPtr;
 
   /*
     Simple ARC management for AdblockEngine
     Use `retain` and `release`
    */
 
   private AtomicInteger referenceCounter = new AtomicInteger(0);
 
   // singleton
   protected AdblockHelper()
@@ skipping 52 matching lines @@
    * @param preferenceName Shared Preferences name to store intercepted requests stats
    * @param urlToResourceIdMap
    */
   public AdblockHelper preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
   {
     this.preloadedPreferenceName = preferenceName;
     this.urlToResourceIdMap = urlToResourceIdMap;
     return this;
   }
 
-  public void useV8Isolate(long ptr)
+  public AdblockHelper useV8IsolateProvider(long ptr)
   {
-    this.v8IsolatePtr = ptr;
+    this.v8IsolateProviderPtr = ptr;
+    return this;

[sergei, 2017/11/07 09:58:45]

Changing of the return value is an unrelated change but it's fine for me.

[anton, 2017/11/07 10:17:05]

Agree it's unrelated in general.
Just want to keep it more close to `Builder` pattern as we change method
signature anyway so now it's suitable time.

   }
 
   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 (v8IsolatePtr != null)
+    if (v8IsolateProviderPtr != null)
     {
-      builder.useV8Isolate(v8IsolatePtr);
+      builder.useV8IsolateProvider(v8IsolateProviderPtr);
     }
 
     // if preloaded subscriptions provided
     if (preloadedPreferenceName != null)
     {
       SharedPreferences preloadedSubscriptionsPrefs = context.getSharedPreferences(
         preloadedPreferenceName,
         Context.MODE_PRIVATE);
       builder.preloadSubscriptions(
         context,
@@ skipping 134 matching lines @@
         engineCreated = null;
       }
       else
       {
         disposeAdblock();
       }
     }
     return lastInstance;
   }
 }