Populate AppInfo properly

jni/abpEngine.cpp

 /*
  * 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
@@ skipping 11 matching lines @@
 #include "Utils.h"
 #include "debug.h"
 
 JavaVM* globalJvm;
 AdblockPlus::FilterEngine* filterEngine;
 jobject jniObject;
 bool manualUpdate = false;
 
 extern "C"
 {
-  JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_initialize(JNIEnv *pEnv, jobject, jstring basepath);
+  JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_initialize(
+    JNIEnv *pEnv, jobject object, jstring basePath, jstring version,
+    jstring sdkVersion, jstring locale, jboolean developmentBuild);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_release(JNIEnv *pEnv, jobject);
   JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_isFirstRun(JNIEnv *pEnv, jobject);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getListedSubscriptions(JNIEnv *pEnv, jobject);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getRecommendedSubscriptions(JNIEnv *pEnv, jobject);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_addSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_removeSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_refreshSubscription(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_actualizeSubscriptionStatus(JNIEnv *pEnv, jobject, jstring url);
   JNIEXPORT jboolean JNICALL Java_org_adblockplus_android_ABPEngine_matches(JNIEnv *pEnv, jobject, jstring url, jstring contentType, jstring documentUrl);
   JNIEXPORT jobjectArray JNICALL Java_org_adblockplus_android_ABPEngine_getSelectorsForDomain(JNIEnv *pEnv, jobject, jstring domain);
@@ skipping 142 matching lines @@
 
 jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
   return JNI_VERSION_1_6;
 }
 
 void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
 {
 }
 
-JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_initialize(JNIEnv *pEnv, jobject pObject, jstring basepath)
+JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_initialize(
+  JNIEnv *pEnv, jobject pObject, jstring basePath, jstring version,
+  jstring sdkVersion, jstring locale, jboolean developmentBuild)
 {
   D(D_WARN, "nativeInitialize()");
   int status = pEnv->GetJavaVM(&globalJvm);
 
   jniObject = pEnv->NewGlobalRef(pObject);
 
-  const std::string path = GetString(pEnv, basepath);
+  AdblockPlus::AppInfo appInfo;
+  appInfo.name = "adblockplusandroid";
+  appInfo.version = GetString(pEnv, version);
+  appInfo.application = "android";
+  appInfo.applicationVersion = GetString(pEnv, sdkVersion);
+  appInfo.locale = GetString(pEnv, locale);
+  appInfo.developmentBuild = developmentBuild;
 
-  AdblockPlus::AppInfo appInfo;
-  // TODO Should be extracted from the manifest
-  appInfo.version = "1.1.2";
-  appInfo.name = "adblockplusandroid";
-  appInfo.application = "android";
+  D(D_INFO, "AppInfo: name=%s, version=%s, application=%s, applicationVersion=%s, locale=%s, developmentBuild=%s",
+    appInfo.name.c_str(), appInfo.version.c_str(), appInfo.application.c_str(),
+    appInfo.applicationVersion.c_str(), appInfo.locale.c_str(),
+    appInfo.developmentBuild ? "true" : "false");
 
   AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));
 
   AdblockPlus::DefaultFileSystem* defaultFileSystem = new AdblockPlus::DefaultFileSystem();
   AndroidLogSystem* androidLogSystem = new AndroidLogSystem();
   AndroidWebRequest* androidWebRequest = new AndroidWebRequest(globalJvm);
 
-  defaultFileSystem->SetBasePath(path);
+  defaultFileSystem->SetBasePath(GetString(pEnv, basePath));
   jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(androidLogSystem));
   jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(defaultFileSystem));
   jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(androidWebRequest));
   jsEngine->SetEventCallback("updateAvailable", std::tr1::bind(&UpdateAvailableCallback, std::tr1::placeholders::_1));
 
   filterEngine = new AdblockPlus::FilterEngine(jsEngine);
   filterEngine->SetFilterChangeCallback(&FilterChangedCallback);
 }
 
 JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_release(JNIEnv *pEnv, jobject)
@@ skipping 115 matching lines @@
   }
 
   return ret;
 }
 
 JNIEXPORT void JNICALL Java_org_adblockplus_android_ABPEngine_checkUpdates(JNIEnv *pEnv, jobject)
 {
   manualUpdate = true;
   filterEngine->ForceUpdateCheck(UpdaterCallback);
 }