Issue 7035 - Update libadblockplus dependency

adblock-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 21 matching lines @@
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.FilterEngine.ContentType;
 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
 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.Updater;
 import org.adblockplus.libadblockplus.WebRequest;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build.VERSION;
 import android.util.Log;
 
 public final class AdblockEngine
 {
   // default base path to store subscription files in android app
   public static final String BASE_PATH_DIRECTORY = "adblock";
 
   private static final String TAG = Utils.getTag(AdblockEngine.class);
 
   /*
    * 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 Platform platform;
   private volatile FilterEngine filterEngine;
+  private volatile Updater updater;
   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 143 matching lines @@
             }
           }
         });
 
         engine.webRequest = wrapper;
       }
     }
 
     private void initCallbacks()
     {
-      if (engine.updateAvailableCallback != null)
+      if (engine.updater != null && engine.updateAvailableCallback != null)
       {
-        engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
+        engine.updater.setUpdateAvailableCallback(engine.updateAvailableCallback);
       }
 
       if (engine.showNotificationCallback != null)
       {
         engine.filterEngine.setShowNotificationCallback(engine.showNotificationCallback);
       }
 
       if (engine.filterChangeCallback != null)
       {
         engine.filterEngine.setFilterChangeCallback(engine.filterChangeCallback);
       }
     }
 
     public AdblockEngine build()
     {
+      return build(false);
+    }
+
+    public AdblockEngine buildWithUpdateCheck()
+    {
+      return build(true);
+    }
+
+    private AdblockEngine build(boolean updateCheckEnabled)
+    {
       initRequests();
 
       // webRequest should be ready to be used passed right after JsEngine is created
-      createEngines();
+      createEngines(updateCheckEnabled);
 
       initCallbacks();
 
       if (!engine.elemhideEnabled)
       {
         androidWebRequest.updateSubscriptionURLs(engine.filterEngine);
       }
 
       return engine;
     }
 
-    private void createEngines()
+    private void createEngines(boolean updateCheckEnabled)
     {
       engine.logSystem = new AndroidLogSystem();
       engine.platform = new Platform(engine.logSystem, engine.webRequest, basePath);
       if (v8IsolateProviderPtr != null)
       {
         engine.platform.setUpJsEngine(appInfo, v8IsolateProviderPtr);
       }
       else
       {
         engine.platform.setUpJsEngine(appInfo);
       }
       engine.platform.setUpFilterEngine(isAllowedConnectionCallback);
       engine.filterEngine = engine.platform.getFilterEngine();
+      if (updateCheckEnabled)
+      {
+        engine.updater = engine.platform.getUpdater();
+      }
     }
   }
 
   public static Builder builder(AppInfo appInfo, String basePath)
   {
     return new Builder(appInfo, basePath);
   }
 
   public void dispose()
   {
     Log.w(TAG, "Dispose");
 
+    if (this.updater != null)
+    {
+      if (this.updateAvailableCallback != null)
+      {
+        this.updater.removeUpdateAvailableCallback();
+      }
+    }
+
     // engines first
     if (this.filterEngine != null)
     {
-      if (this.updateAvailableCallback != null)
-      {
-        this.filterEngine.removeUpdateAvailableCallback();
-      }
-
       if (this.filterChangeCallback != null)
       {
         this.filterEngine.removeFilterChangeCallback();
       }
 
       if (this.showNotificationCallback != null)
       {
         this.filterEngine.removeShowNotificationCallback();
       }
 
       this.platform.dispose();
       this.platform = null;
     }
 
     // callbacks then
     if (this.updateAvailableCallback != null)
     {
       this.updateAvailableCallback.dispose();
       this.updateAvailableCallback = null;
     }
 
+    if (this.updateCheckDoneCallback != null)
+    {
+      this.updateCheckDoneCallback.dispose();
+      this.updateCheckDoneCallback = null;
+    }
+
     if (this.filterChangeCallback != null)
     {
       this.filterChangeCallback.dispose();
       this.filterChangeCallback = null;
     }
 
     if (this.showNotificationCallback != null)
     {
       this.showNotificationCallback.dispose();
       this.showNotificationCallback = null;
@@ skipping 290 matching lines @@
         || this.isDocumentWhitelisted(url, referrerChainArray)
         || this.isElemhideWhitelisted(url, referrerChainArray))
     {
       return new ArrayList<String>();
     }
     return this.filterEngine.getElementHidingSelectors(domain);
   }
 
   public void checkForUpdates()
   {
-    this.filterEngine.forceUpdateCheck(this.updateCheckDoneCallback);
+    if (updater == null) throw new IllegalStateException();
+    this.updater.forceUpdateCheck(this.updateCheckDoneCallback);
   }
 
   public FilterEngine getFilterEngine()
   {
     return this.filterEngine;
   }
 
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }