Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

libadblockplus-android/jni/JniJsEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 22 matching lines @@
 
   appInfo.developmentBuild = JniGetBooleanField(env, clazz, jAppInfo, "developmentBuild");
 }
 
 static AdblockPlus::JsEngine& GetJsEngineRef(jlong ptr)
 {
   return *JniLongToTypePtr<JniJsEngine>(ptr)->jsEngine;
 }
 
 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject jAppInfo,
-  jobject logSystem, jobject webRequest)
+  jobject logSystem, jobject webRequest, jstring jBasePath)
 {
   AdblockPlus::AppInfo appInfo;
 
   TransformAppInfo(env, jAppInfo, appInfo);
 
   try
   {
     AdblockPlus::TimerPtr timer = AdblockPlus::CreateDefaultTimer();
     JniJsEngine* jniJsEngine = new JniJsEngine();
     jniJsEngine->timer = timer.get();
     jniJsEngine->jsEngine = AdblockPlus::JsEngine::New(appInfo, std::move(timer));
     if (logSystem)
     {
       jniJsEngine->jsEngine->SetLogSystem(std::make_shared<JniLogSystemCallback>(env, logSystem));
     }
     if (webRequest)
     {
       jniJsEngine->jsEngine->SetWebRequest(std::make_shared<JniWebRequest>(env, webRequest));
     }
+    if (jBasePath)
+    {
+      auto fileSystem = std::make_shared<AdblockPlus::DefaultFileSystemSync>();
+      std::string basePath = JniJavaToStdString(env, jBasePath);
+      fileSystem->SetBasePath(basePath);
+      jniJsEngine->jsEngine->SetFileSystem(fileSystem);
+    }
 
     return JniPtrToLong(jniJsEngine);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
   delete JniLongToTypePtr<JniJsEngine>(ptr);
 }
@@ skipping 64 matching lines @@
     env->ReleasePrimitiveArrayCritical(jJsPtrs, ptrs, JNI_ABORT);
   }
 
   try
   {
     engine.TriggerEvent(eventName, std::move(args));
   }
   CATCH_AND_THROW(env)
 }
 
-static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr, jstring jBasePath)
-{
-  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
-
-  try
-  {
-    auto fileSystem = std::make_shared<AdblockPlus::DefaultFileSystemSync>();
-
-    std::string basePath = JniJavaToStdString(env, jBasePath);
-    fileSystem->SetBasePath(basePath);
-
-    engine.SetFileSystem(fileSystem);
-  }
-  CATCH_AND_THROW(env)
-}
-
 static jobject JNICALL JniNewLongValue(JNIEnv* env, jclass clazz, jlong ptr, jlong value)
 {
   AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     return NewJniJsValue(env, engine.NewValue(static_cast<int64_t>(value)));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
@@ skipping 22 matching lines @@
 }
 
 // TODO: List of functions that lack JNI bindings
 //JsValuePtr NewObject();
 //JsValuePtr NewCallback(v8::InvocationCallback callback);
 //static JsEnginePtr FromArguments(const v8::Arguments& arguments);
 //JsValueList ConvertArguments(const v8::Arguments& arguments);
 
 static JNINativeMethod methods[] =
 {
-  { (char*)"ctor", (char*)"(" TYP("AppInfo") TYP("LogSystem") TYP("WebRequest") ")J", (void*)JniCtor },
+  { (char*)"ctor", (char*)"(" TYP("AppInfo") TYP("LogSystem") TYP("WebRequest") "Ljava/lang/String;)J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor },
 
   { (char*)"setEventCallback", (char*)"(JLjava/lang/String;J)V", (void*)JniSetEventCallback },
   { (char*)"removeEventCallback", (char*)"(JLjava/lang/String;)V", (void*)JniRemoveEventCallback },
   { (char*)"triggerEvent", (char*)"(JLjava/lang/String;[J)V", (void*)JniTriggerEvent },
 
   { (char*)"evaluate", (char*)"(JLjava/lang/String;Ljava/lang/String;)" TYP("JsValue"), (void*)JniEvaluate },
 
-  { (char*)"setDefaultFileSystem", (char*)"(JLjava/lang/String;)V", (void*)JniSetDefaultFileSystem },
-
   { (char*)"newValue", (char*)"(JJ)" TYP("JsValue"), (void*)JniNewLongValue },
   { (char*)"newValue", (char*)"(JZ)" TYP("JsValue"), (void*)JniNewBooleanValue },
   { (char*)"newValue", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniNewStringValue }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_JsEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }