From d4ee164c7cdd85fec8dc9af965477553e9f39dd3 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 22 Jan 2021 14:45:05 +0700 Subject: [PATCH] [Input pipe] More debugs on clipboard --- .../java/net/kdt/pojavlaunch/BaseMainActivity.java | 2 +- app_pojavlauncher/src/main/jni/input_bridge_v3.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java index 2600da319..9350a54f9 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java @@ -826,7 +826,7 @@ public class BaseMainActivity extends LoggableActivity { } public static void fullyExit() { - System.exit(0); + android.os.Process.killProcess(android.os.Process.myPid()); } public void forceUserHome(String s) throws Exception { diff --git a/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_pojavlauncher/src/main/jni/input_bridge_v3.c index 2569ad4da..96cb5dc24 100644 --- a/app_pojavlauncher/src/main/jni/input_bridge_v3.c +++ b/app_pojavlauncher/src/main/jni/input_bridge_v3.c @@ -184,13 +184,20 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNI #ifdef DEBUG LOGD("Debug: Clipboard access is going on\n", isUseStackQueueCall); #endif + assert(dalvikJNIEnvPtr_JRE != NULL); + + LOGD("Clipboard: Obtaining class\n"); jclass bridgeClazz = (*dalvikJNIEnvPtr_JRE)->FindClass(dalvikJNIEnvPtr_JRE, "org/lwjgl/glfw/CallbackBridge"); assert(bridgeClazz != NULL); + LOGD("Clipboard: Obtaining class\n"); jmethodID bridgeMethod = (*dalvikJNIEnvPtr_JRE)->GetStaticMethodID(dalvikJNIEnvPtr_JRE, bridgeClazz, "accessAndroidClipboard", "(ILjava/lang/String;)Ljava/lang/String;"); assert(bridgeMethod != NULL); - jstring copyDst = convertStringJVM(runtimeJNIEnvPtr_ANDROID, dalvikJNIEnvPtr_JRE, copySrc); - return convertStringJVM(dalvikJNIEnvPtr_JRE, runtimeJNIEnvPtr_ANDROID, (jstring) (*dalvikJNIEnvPtr_JRE)->CallStaticObjectMethod(dalvikJNIEnvPtr_JRE, bridgeClazz, bridgeMethod, action, copyDst)); + LOGD("Clipboard: Converting string\n"); + jstring copyDst = convertStringJVM(env, dalvikJNIEnvPtr_JRE, copySrc); + + LOGD("Clipboard: Calling 2nd\n"); + return convertStringJVM(dalvikJNIEnvPtr_JRE, env, (jstring) (*dalvikJNIEnvPtr_JRE)->CallStaticObjectMethod(dalvikJNIEnvPtr_JRE, bridgeClazz, bridgeMethod, action, copyDst)); } JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) {