Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

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 14 matching lines @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 import org.adblockplus.libadblockplus.AppInfo;
 import org.adblockplus.libadblockplus.Filter;
 import org.adblockplus.libadblockplus.FilterChangeCallback;
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.FilterEngine.ContentType;
 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
-import org.adblockplus.libadblockplus.JsEngine;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.LogSystem;
+import org.adblockplus.libadblockplus.Platform;
 import org.adblockplus.libadblockplus.ShowNotificationCallback;
 import org.adblockplus.libadblockplus.Subscription;
 import org.adblockplus.libadblockplus.UpdateAvailableCallback;
 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 import org.adblockplus.libadblockplus.WebRequest;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build.VERSION;
@@ skipping 12 matching lines @@
    * The fields below are volatile because:
    *
    * I encountered JNI related bugs/crashes caused by JNI backed Java objects. It seemed that under
    * certain conditions the objects were optimized away which resulted in crashes when trying to
    * release the object, sometimes even on access.
    *
    * The only solution that really worked was to declare the variables holding the references
    * volatile, this seems to prevent the JNI from 'optimizing away' those objects (as a volatile
    * variable might be changed at any time from any thread).
    */
-  private volatile JsEngine jsEngine;
+  private volatile Platform platform;
   private volatile FilterEngine filterEngine;
   private volatile LogSystem logSystem;
   private volatile WebRequest webRequest;
   private volatile UpdateAvailableCallback updateAvailableCallback;
   private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
   private volatile FilterChangeCallback filterChangeCallback;
   private volatile ShowNotificationCallback showNotificationCallback;
   private volatile boolean elemhideEnabled;
   private volatile boolean enabled = true;
   private volatile List<String> whitelistedDomains;
@@ skipping 166 matching lines @@
       initCallbacks();
 
       androidWebRequest.updateSubscriptionURLs(engine.filterEngine);
 
       return engine;
     }
 
     private void createEngines()
     {
       engine.logSystem = new AndroidLogSystem();
-      engine.jsEngine = new JsEngine(appInfo, engine.logSystem, engine.webRequest, basePath);
-
-      engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectionCallback);
+      engine.platform = new Platform(engine.logSystem, engine.webRequest, basePath);
+      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);
   }
 
   public void dispose()
   {
@@ skipping 10 matching lines @@
       if (this.filterChangeCallback != null)
       {
         this.filterEngine.removeFilterChangeCallback();
       }
 
       if (this.showNotificationCallback != null)
       {
         this.filterEngine.removeShowNotificationCallback();
       }
 
-      this.filterEngine.dispose();
-      this.filterEngine = null;
-    }
-
-    if (this.jsEngine != null)
-    {
-      this.jsEngine.dispose();
-      this.jsEngine = null;
+      this.platform.dispose();
+      this.platform = null;
     }
 
     // callbacks then
     if (this.updateAvailableCallback != null)
     {
       this.updateAvailableCallback.dispose();
       this.updateAvailableCallback = null;
     }
 
     if (this.filterChangeCallback != null)
@@ skipping 307 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }