Issue 4146 - Fix failing UpdateCheckTest.testApplicationUpdateAvailable test in libadblockplus-andr…

libadblockplus-android/jni/JniJsValue.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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/>.
  */
 
 #include <AdblockPlus.h>
 #include "Utils.h"
 #include "JniJsValue.h"
 
 // precached in JNI_OnLoad and released in JNI_OnUnload
 jclass globalJsValueClass;
 jmethodID jsValueClassCtor;
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-  JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
-  {
-    return JNI_ERR;
-  }
-
+void JniJsValue_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved)
+{
   // precache for performance and avoid attaching threads
   jclass localJsValueClass = env->FindClass(PKG("JsValue"));
   globalJsValueClass = (jclass)env->NewGlobalRef(localJsValueClass);
   jsValueClassCtor = env->GetMethodID(globalJsValueClass, "<init>", "(J)V");
   env->DeleteLocalRef(localJsValueClass);
-
-  return JNI_VERSION_1_6;
+}
+
+void JniJsValue_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved)
+{
+  if (globalJsValueClass)
+  {
+    env->DeleteGlobalRef(globalJsValueClass);
+  }
 }
 
 static jboolean JNICALL JniIsUndefined(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
     return JniGetJsValue(ptr)->IsUndefined() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
@@ skipping 173 matching lines @@
   { (char*)"asBoolean", (char*)"(J)Z", (void*)JniAsBoolean },
   { (char*)"asList", (char*)"(J)Ljava/util/List;", (void*)JniAsList },
   { (char*)"getProperty", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetProperty },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_JsValue_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }
-
-void JNI_OnUnload(JavaVM *vm, void *reserved)
-{
-  JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
-  {
-    return;
-  }
-
-  if (globalJsValueClass)
-  {
-    env->DeleteGlobalRef(globalJsValueClass);
-  }
-}