New JNI bindings

jni/Utils.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH

[Felix Dahlke, 2014/03/28 08:29:00]

Why this?

[René Jeschke, 2014/03/28 10:59:15]

Ah, this was definitely a mistake. (Merge went wrong)

+ * 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.
  *
@@ skipping 18 matching lines @@
   const char *s = pEnv->GetStringUTFChars(str, &iscopy);
   jsize len = pEnv->GetStringUTFLength(str);
 
   const std::string value(s, len);
 
   pEnv->ReleaseStringUTFChars(str, s);
 
   return value;
 }
 
-std::string AdblockPlus::Android::JniJava2StdString(JNIEnv* env, jstring str)
+std::string JniJavaToStdString(JNIEnv* env, jstring str)
 {
   if (!str)
   {
     return std::string();
   }
 
   const char* cStr = env->GetStringUTFChars(str, 0);
   std::string ret(cStr);
   env->ReleaseStringUTFChars(str, cStr);
 
   return ret;
 }
 
-jobject AdblockPlus::Android::NewJniArrayList(JNIEnv* env)
+jobject NewJniArrayList(JNIEnv* env)
 {
   jclass clazz = env->FindClass("java/util/ArrayList");
   jmethodID ctor = env->GetMethodID(clazz, "<init>", "()V");
   return env->NewObject(clazz, ctor);
 }
 
-void AdblockPlus::Android::JniAddObjectToList(JNIEnv* env, jobject list, jobject value)
+void JniAddObjectToList(JNIEnv* env, jobject list, jobject value)
 {
   jmethodID add = env->GetMethodID(env->GetObjectClass(list), "add", "(Ljava/lang/Object;)Z");
   env->CallBooleanMethod(list, add, value);
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env, const std::string& message)
+void JniThrowException(JNIEnv* env, const std::string& message)
 {
   jclass clazz = env->FindClass(PKG("AdblockPlusException"));
   env->ThrowNew(clazz, message.c_str());
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env, const std::exception& e)
+void JniThrowException(JNIEnv* env, const std::exception& e)
 {
   JniThrowException(env, e.what());
 }
 
-void AdblockPlus::Android::JniThrowException(JNIEnv* env)
+void JniThrowException(JNIEnv* env)
 {
-  JniThrowException(env, "Unknown exception from libAdblockPlus");
+  JniThrowException(env, "Unknown exception from libadblockplus");
 }
+
+JNIEnvAcquire::JNIEnvAcquire(JavaVM* javaVM)
+  : javaVM(javaVM), jniEnv(0), attachmentStatus(0)
+{
+  attachmentStatus = javaVM->GetEnv((void **)&jniEnv, ABP_JNI_VERSION);
+  if (attachmentStatus == JNI_EDETACHED)
+  {
+    if (javaVM->AttachCurrentThread(&jniEnv, 0))
+    {
+      // This one is FATAL, we can't recover from this (because without a JVM we're dead), so
+      // throwing a runtime_exception in a ctor can be tolerated here IMHO
+      throw std::runtime_error("Failed to get JNI environment");
+    }
+  }
+}
+
+JNIEnvAcquire::~JNIEnvAcquire()
+{
+  if (attachmentStatus == JNI_EDETACHED)
+  {
+    javaVM->DetachCurrentThread();
+  }
+}