fix function

Author: Wiki

quickjs-android/src/androidTest/java/com/quickjs/android/JSFunctionTest.java

@@ -26,10 +26,10 @@ public void tearDown() throws Exception {
 
  @Test
  public void testJavaCallback() {
- context.set("intFunction", new JSFunction(context, (receiver, args) -> Integer.MAX_VALUE));
- context.set("doubleFunction", new JSFunction(context, (receiver, args) -> Double.MAX_VALUE));
- context.set("boolFunction", new JSFunction(context, (receiver, args) -> true));
- context.set("stringFunction", new JSFunction(context, (receiver, args) -> "Hello"));
+ context.set("intFunction", new JSFunction(context, (JavaCallback) (receiver, array) -> Integer.MAX_VALUE));
+ context.set("doubleFunction", new JSFunction(context, (JavaCallback) (receiver, args) -> Double.MAX_VALUE));
+ context.set("boolFunction", new JSFunction(context, (JavaCallback) (receiver, args) -> true));
+ context.set("stringFunction", new JSFunction(context, (JavaCallback) (receiver, args) -> "Hello"));
  assertEquals(Integer.MAX_VALUE, context.executeIntegerFunction("intFunction", null));
  assertEquals(Double.MAX_VALUE, context.executeDoubleFunction("doubleFunction", null), 1);
  assertTrue(context.executeBooleanFunction("boolFunction", null));

quickjs-android/src/main/cpp/quickjs-jni.cpp

@@ -202,10 +202,10 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
  booleanInitMethodID = env->GetMethodID(booleanCls, "<init>", "(Z)V");
 
  callJavaVoidCallbackMethodID = env->GetStaticMethodID(quickJSCls, "callJavaVoidCallback",
- "(JLcom/quickjs/android/JSValue;Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSArray;)V");
+ "(Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSArray;)V");
 
  callJavaCallbackMethodID = env->GetStaticMethodID(quickJSCls, "callJavaCallback",
- "(JLcom/quickjs/android/JSValue;Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSArray;)Ljava/lang/Object;");
+ "(Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSValue;Lcom/quickjs/android/JSArray;)Ljava/lang/Object;");
 
  createJSValueMethodID = env->GetStaticMethodID(quickJSCls, "createJSValue",
  "(JIJIDJ)Lcom/quickjs/android/JSValue;");
@@ -447,16 +447,16 @@ callJavaCallback(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *
  JS_SetPropertyUint32(ctx, args, i, it);
  }
  }
- jlong contextPtr = reinterpret_cast<long>(ctx);
  jobject objectHandle = TO_JAVA_OBJECT(env, ctx, this_val);
  jobject functionHandle = TO_JAVA_OBJECT(env, ctx, func);
  jobject argsHandle = TO_JAVA_OBJECT(env, ctx, args);
  jobject result = env->CallStaticObjectMethod(quickJSCls, callJavaCallbackMethodID,
- contextPtr,
  objectHandle,
  functionHandle,
  argsHandle);
- if (env->IsInstanceOf(result, integerCls)) {
+ if (result == nullptr) {
+ return JS_NULL;
+ } else if (env->IsInstanceOf(result, integerCls)) {
  return JS_NewInt32(ctx, env->CallIntMethod(result, intValueMethodID));
  } else if (env->IsInstanceOf(result, doubleCls)) {
  return JS_NewFloat64(ctx, env->CallDoubleMethod(result, doubleValueMethodID));
@@ -483,12 +483,10 @@ callJavaVoidCallback(JSContext *ctx, JSValueConst this_val, int argc, JSValueCon
  JS_SetPropertyUint32(ctx, args, i, it);
  }
  }
- jlong contextPtr = reinterpret_cast<long>(ctx);
  jobject objectHandle = TO_JAVA_OBJECT(env, ctx, this_val);
  jobject functionHandle = TO_JAVA_OBJECT(env, ctx, func);
  jobject argsHandle = TO_JAVA_OBJECT(env, ctx, args);
  env->CallStaticVoidMethod(quickJSCls, callJavaVoidCallbackMethodID,
- contextPtr,
  objectHandle,
  functionHandle,
  argsHandle);

quickjs-android/src/main/java/com/quickjs/android/QuickJS.java

@@ -42,8 +42,8 @@ static class MethodDescriptor {
 
 
  @Keep
- static void callJavaVoidCallback(long contextPtr, JSValue objectHandle, JSValue functionHandle, JSArray argsHandle) {
- JSContext context = sContextMap.get(contextPtr);
+ static void callJavaVoidCallback(JSValue objectHandle, JSValue functionHandle, JSArray argsHandle) {
+ JSContext context = sContextMap.get(functionHandle.context.getContextPtr());
  if (context == null) {
  return;
  }
@@ -57,8 +57,8 @@ static void callJavaVoidCallback(long contextPtr, JSValue objectHandle, JSValue
  }
 
  @Keep
- static Object callJavaCallback(long contextPtr, JSValue objectHandle, JSValue functionHandle, JSArray argsHandle) {
- JSContext context = sContextMap.get(contextPtr);
+ static Object callJavaCallback(JSValue objectHandle, JSValue functionHandle, JSArray argsHandle) {
+ JSContext context = sContextMap.get(functionHandle.context.getContextPtr());
  if (context == null) {
  return null;
  }