Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e

src/org/adblockplus/android/ABPEngine.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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.EventCallback;
 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.Subscription;
-import org.adblockplus.libadblockplus.UpdaterCallback;
+import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 import org.adblockplus.libadblockplus.WebRequest;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build.VERSION;
 import android.util.Log;
 
 public final class ABPEngine
 {
@@ skipping 10 matching lines @@
    *
    * 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 FilterEngine filterEngine;
   private volatile LogSystem logSystem;
   private volatile WebRequest webRequest;
   private volatile EventCallback updateCallback;
-  private volatile UpdaterCallback updaterCallback;
+  private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
   private volatile FilterChangeCallback filterChangeCallback;
 
   private ABPEngine(final Context context)
   {
     this.context = context;
   }
 
   public static AppInfo generateAppInfo(final Context context)
   {
     String version = "0";
@@ skipping 31 matching lines @@
     engine.webRequest = new AndroidWebRequest();
     engine.jsEngine.setWebRequest(engine.webRequest);
 
     engine.updateCallback = new AndroidUpdateAvailableCallback(context);
     engine.jsEngine.setEventCallback("updateAvailable", engine.updateCallback);
 
     engine.filterEngine = new FilterEngine(engine.jsEngine);
     engine.filterChangeCallback = new AndroidFilterChangeCallback(context);
     engine.filterEngine.setFilterChangeCallback(engine.filterChangeCallback);
 
-    engine.updaterCallback = new AndroidUpdaterCallback(context);
+    engine.updateCheckDoneCallback = new AndroidUpdateCheckDoneCallback(context);
 
     return engine;
   }
 
   public void dispose()
   {
     // Safe disposing (just in case)
     if (this.filterEngine != null)
     {
       this.filterEngine.dispose();
@@ skipping 17 matching lines @@
       this.webRequest.dispose();
       this.webRequest = null;
     }
 
     if (this.updateCallback != null)
     {
       this.updateCallback.dispose();
       this.updateCallback = null;
     }
 
-    if (this.updaterCallback != null)
+    if (this.updateCheckDoneCallback != null)
     {
-      this.updaterCallback.dispose();
-      this.updaterCallback = null;
+      this.updateCheckDoneCallback.dispose();
+      this.updateCheckDoneCallback = null;
     }
 
     if (this.filterChangeCallback != null)
     {
       this.filterChangeCallback.dispose();
       this.filterChangeCallback = null;
     }
   }
 
   public boolean isFirstRun()
@@ skipping 70 matching lines @@
         sub.removeFromList();
       }
     }
   }
 
   public String getDocumentationLink()
   {
     return this.filterEngine.getPref("documentation_link").toString();
   }
 
-  public boolean matches(final String fullUrl, final String contentType, final String[] referrerChainArray)
+  public boolean matches(final String fullUrl, final ContentType contentType, final String[] referrerChainArray)
   {
     final Filter filter = this.filterEngine.matches(fullUrl, contentType, referrerChainArray);
 
     if (filter == null)
     {
       return false;
     }
 
     // hack: if there is no referrer, block only if filter is domain-specific
     // (to re-enable in-app ads blocking, proposed on 12.11.2012 Monday meeting)
     // (documentUrls contains the referrers on Android)
     if (referrerChainArray.length == 0 && (filter.getProperty("text").toString()).contains("||"))
     {
       return false;
     }
 
     return filter.getType() != Filter.Type.EXCEPTION;
   }
 
   public void checkForUpdates()
   {
-    this.filterEngine.forceUpdateCheck(this.updaterCallback);
+    this.filterEngine.forceUpdateCheck(this.updateCheckDoneCallback);
   }
 
   public void updateSubscriptionStatus(final String url)
   {
     final Subscription sub = this.filterEngine.getSubscription(url);
     if (sub != null)
     {
       Utils.updateSubscriptionStatus(this.context, sub);
     }
   }
 }