Issue 98 - Use the libadblockplus update mechanism

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.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.NameNotFoundException;
 import android.os.Build.VERSION;
 import android.util.Log;
 
 public final class ABPEngine
@@ skipping 10 matching lines @@
    * 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 FilterEngine filterEngine;
   private volatile LogSystem logSystem;
   private volatile WebRequest webRequest;
-  private volatile EventCallback updateCallback;
+  private volatile UpdateAvailableCallback updateAvailableCallback;
   private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
   private volatile FilterChangeCallback filterChangeCallback;
 
   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";
     try
     {
       final PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-      version = info.versionName + "." + info.versionCode;
+      version = info.versionName;
+      if (developmentBuild)
+        version += "." + info.versionCode;
     }
     catch (final NameNotFoundException e)
     {
       Log.e(TAG, "Failed to get the application version number", e);
     }
     final String sdkVersion = String.valueOf(VERSION.SDK_INT);
     final String locale = Locale.getDefault().toString().replace('_', '-');
-    final boolean developmentBuild = !context.getResources().getBoolean(R.bool.def_release);
 
     return AppInfo.builder()
         .setVersion(version)
         .setApplicationVersion(sdkVersion)
         .setLocale(locale)
         .setDevelopmentBuild(developmentBuild)
         .build();
   }
 
   public static ABPEngine create(final Context context, final AppInfo appInfo, final String basePath)
   {
     final ABPEngine engine = new ABPEngine(context);
 
     engine.jsEngine = new JsEngine(appInfo);
     engine.jsEngine.setDefaultFileSystem(basePath);
 
     engine.logSystem = new AndroidLogSystem();
     engine.jsEngine.setLogSystem(engine.logSystem);
 
     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.updateAvailableCallback = new AndroidUpdateAvailableCallback(context);
+    engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
     engine.filterChangeCallback = new AndroidFilterChangeCallback(context);
     engine.filterEngine.setFilterChangeCallback(engine.filterChangeCallback);
 
     engine.updateCheckDoneCallback = new AndroidUpdateCheckDoneCallback(context);
 
     return engine;
   }
 
   public void dispose()
   {
@@ skipping 15 matching lines @@
       this.logSystem.dispose();
       this.logSystem = null;
     }
 
     if (this.webRequest != null)
     {
       this.webRequest.dispose();
       this.webRequest = null;
     }
 
-    if (this.updateCallback != null)
+    if (this.updateAvailableCallback != null)
     {
-      this.updateCallback.dispose();
-      this.updateCallback = null;
+      this.updateAvailableCallback.dispose();
+      this.updateAvailableCallback = null;
     }
 
     if (this.updateCheckDoneCallback != null)
     {
       this.updateCheckDoneCallback.dispose();
       this.updateCheckDoneCallback = null;
     }
 
     if (this.filterChangeCallback != null)
     {
@@ skipping 110 matching lines @@
 
   public void updateSubscriptionStatus(final String url)
   {
     final Subscription sub = this.filterEngine.getSubscription(url);
     if (sub != null)
     {
       Utils.updateSubscriptionStatus(this.context, sub);
     }
   }
 }