Issue 5643 - Make v8::Isolate injectable into JsEngine

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.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 115 matching lines @@
    */
   public static class Builder
   {
     private Context context;
     private Map<String, Integer> urlToResourceIdMap;
     private AndroidWebRequestResourceWrapper.Storage resourceStorage;
     private AndroidWebRequest androidWebRequest;
     private AppInfo appInfo;
     private String basePath;
     private IsAllowedConnectionCallback isAllowedConnectionCallback;
     private Long v8IsolatePtr;

[sergei, 2017/09/28 09:34:49]

I'm not sure about Long vs long here, but it seems fine.

 
     private AdblockEngine engine;
 
     protected Builder(final AppInfo appInfo, final String basePath)
     {
       engine = new AdblockEngine();
       engine.elemhideEnabled = true;
 
       // we can't create JsEngine and FilterEngine right now as it starts to download subscriptions
       // and requests (AndroidWebRequest and probbaly wrappers) are not specified yet
@@ skipping 108 matching lines @@
 
       androidWebRequest.updateSubscriptionURLs(engine.filterEngine);
 
       return engine;
     }
 
     private void createEngines()
     {
       engine.logSystem = new AndroidLogSystem();
       engine.platform = new Platform(engine.logSystem, engine.webRequest, basePath);
-      engine.platform.setUpJsEngine(appInfo, v8IsolatePtr);
+      if (v8IsolatePtr != null)
+      {
+        engine.platform.setUpJsEngine(appInfo, v8IsolatePtr);
+      }
+      else
+      {
+        engine.platform.setUpJsEngine(appInfo);
+      }
       engine.platform.setUpFilterEngine(isAllowedConnectionCallback);
       engine.filterEngine = engine.platform.getFilterEngine();
     }
   }
 
   public static Builder builder(AppInfo appInfo, String basePath)
   {
     return new Builder(appInfo, basePath);
   }
 
@@ skipping 341 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }