Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

src/org/adblockplus/android/ABPEngine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.util.List;
 import java.util.Locale;
 
 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.JsEngine;
 import org.adblockplus.libadblockplus.LogSystem;
-import org.adblockplus.libadblockplus.Notification;
+import org.adblockplus.libadblockplus.ShowNotificationCallback;
 import org.adblockplus.libadblockplus.Subscription;
 import org.adblockplus.libadblockplus.UpdateAvailableCallback;
 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build.VERSION;
 import android.util.Log;
 
@@ skipping 14 matching lines @@
    * 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 FilterEngine filterEngine;
   private volatile LogSystem logSystem;
   private volatile AndroidWebRequest webRequest;
   private volatile UpdateAvailableCallback updateAvailableCallback;
   private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
   private volatile FilterChangeCallback filterChangeCallback;
+  private volatile ShowNotificationCallback showNotificationCallback;
 
   private ABPEngine(final Context context)
   {
     this.context = context;
   }
 
   public static AppInfo generateAppInfo(final Context context)
   {
     final boolean developmentBuild = !context.getResources().getBoolean(R.bool.def_release);
     String version = "0";
@@ skipping 36 matching lines @@
 
     engine.webRequest.updateSubscriptionURLs(engine.filterEngine);
 
     engine.updateAvailableCallback = new AndroidUpdateAvailableCallback(context);
     engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
     engine.filterChangeCallback = new AndroidFilterChangeCallback(context);
     engine.filterEngine.setFilterChangeCallback(engine.filterChangeCallback);
 
     engine.updateCheckDoneCallback = new AndroidUpdateCheckDoneCallback(context);
 
+    engine.showNotificationCallback = new AndroidShowNotificationCallback(context);
+    engine.filterEngine.setShowNotificationCallback(engine.showNotificationCallback);
+
     return engine;
   }
 
   public void dispose()
   {
     // Safe disposing (just in case)
     if (this.filterEngine != null)
     {
       this.filterEngine.dispose();
       this.filterEngine = null;
@@ skipping 27 matching lines @@
     {
       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;
+    }
   }
 
   public boolean isFirstRun()
   {
     return this.filterEngine.isFirstRun();
   }
 
   private static org.adblockplus.android.Subscription convertJsSubscription(final Subscription jsSubscription)
   {
     final org.adblockplus.android.Subscription subscription = new org.adblockplus.android.Subscription();
@@ skipping 96 matching lines @@
   }
 
   public void updateSubscriptionStatus(final String url)
   {
     final Subscription sub = this.filterEngine.getSubscription(url);
     if (sub != null)
     {
       Utils.updateSubscriptionStatus(this.context, sub);
     }
   }
-
-  public Notification getNextNotificationToShow(String url)
-  {
-    return this.filterEngine.getNextNotificationToShow(url);
-  }
-
-  public Notification getNextNotificationToShow()
-  {
-    return this.filterEngine.getNextNotificationToShow();
-  }
 }