New JNI bindings

jni/JniFilterChangeCallback.cpp

Index: jni/JniFilterChangeCallback.cpp
diff --git a/jni/JniFilterChangeCallback.cpp b/jni/JniFilterChangeCallback.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f67629817a8dd4e038a95a2bd1796977d7480f52
--- /dev/null
+++ b/jni/JniFilterChangeCallback.cpp
@@ -0,0 +1,69 @@
+/*
+ * This file is part of Adblock Plus <http://adblockplus.org/>,
+ * 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.
+ *
+ * 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 "JniCallbacks.h"
+
+JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject)
+{
+}
+
+JniFilterChangeCallback::~JniFilterChangeCallback()
+{
+}
+
+void JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue)
+{
+  JNIEnvAcquire env(GetJavaVM());
+
+  jclass clazz = env->GetObjectClass(GetCallbackObject());
+  jmethodID method = env->GetMethodID(clazz, "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
+
+  if (method)
+  {
+    jstring jArg = env->NewStringUTF(arg.c_str());
+    jobject jJsValue = NewJniJsValue(*env, jsValue);
+    env->CallVoidMethod(GetCallbackObject(), method, jArg, jJsValue);
+  }
+
+  CheckAndLogJavaException(*env);
+}
+
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)

[Felix Dahlke, 2014/03/28 17:28:41]

Static stuff to the top here as well please.

[René Jeschke, 2014/04/11 12:25:53]

Done.

+{
+  TRY
+  {
+    return JniPtrToLong(new JniFilterChangeCallback(env, callbackObject));
+  }
+  CATCH_THROW_AND_RETURN(env, 0)
+}
+
+static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
+{
+  delete JniLongToTypePtr<JniFilterChangeCallback>(ptr);
+}
+
+static JNINativeMethod methods[] =
+{
+  { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
+  { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
+};
+
+extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_FilterChangeCallback_registerNatives(JNIEnv *env, jclass clazz)
+{
+  env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
+}