Populate AppInfo properly

src/org/adblockplus/android/ABPEngine.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 org.adblockplus.android.updater.UpdaterActivity;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Build.VERSION;
 import android.support.v4.app.NotificationCompat;
+import android.util.Log;
 
 public class ABPEngine
 {
   private final static String TAG = "ABPEngine";
   private static final int NOTIFICATION_ID = R.string.app_name + 1;
 
   private Context context;
 
   public ABPEngine(Context context, String basePath)
   {
     this.context = context;
-    initialize(basePath);
+    String version;
+    try
+    {
+      final PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+      version = info.versionName + "." + info.versionCode;
+    } catch (NameNotFoundException e)
+    {
+      Log.e(TAG, "Failed to get the application version number", e);
+      version = "0";
+    }
+    final String applicationVersion = String.valueOf(VERSION.SDK_INT);

[Wladimir Palant, 2013/11/17 06:31:06]

Shouldn't this be called sdkVersion?

[Felix Dahlke, 2013/11/18 15:42:35]

Done.

+    final String locale = context.getResources().getConfiguration().locale.toString();
+    final boolean developmentBuild = !context.getResources().getBoolean(R.bool.def_release);
+    initialize(basePath, version, applicationVersion, locale, developmentBuild);
   }
 
   public void onFilterChanged(String url, String status, long time)
   {
     context.sendBroadcast(new Intent(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS).putExtra("url", url).putExtra("status", status).putExtra("time", time));
   }
   
   /**
    * Called when update event occurred.
    * @param url Update download address
    */
   public void onUpdateEvent(String url, String error)
   {
     Notification notification = getNotification(url, error);
     NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
     notificationManager.notify(NOTIFICATION_ID, notification);
   }
   
-  private native void initialize(String basePath);
+  private native void initialize(String basePath, String version, String sdkVersion, String locale, boolean developmentBuild);
 
   public native void release();
   
   public native boolean isFirstRun();
 
   public native Subscription[] getListedSubscriptions();
 
   public native Subscription[] getRecommendedSubscriptions();
 
   public native void addSubscription(String url);
@@ skipping 46 matching lines @@
 
     Notification notification = builder.getNotification();
     return notification;
   }
 
   static
   {
     System.loadLibrary("abpEngine");
   }
 }