diff --git a/app/src/main/jni/input_bridge_v3.c b/app/src/main/jni/input_bridge_v3.c index 8d1797207..3de628084 100644 --- a/app/src/main/jni/input_bridge_v3.c +++ b/app/src/main/jni/input_bridge_v3.c @@ -77,14 +77,11 @@ ADD_CALLBACK_WWIN(WindowSize); #undef ADD_CALLBACK_WWIN -void attachThreadIfNeed(bool isAndroid, bool* isAttached, JNIEnv** secondJNIEnvPtr) { - if (!*isAttached) { - if (isAndroid && runtimeJavaVMPtr) { - (*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL); - } else if (!isAndroid && dalvikJavaVMPtr) { - (*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL); - } - *isAttached = true; +void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) { + if (isAndroid && runtimeJavaVMPtr) { + (*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL); + } else if (!isAndroid && dalvikJavaVMPtr) { + (*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL); } } @@ -111,17 +108,17 @@ void sendData(int type, int i1, int i2, int i3, int i4) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) { isUseStackQueueCall = (int) isUseStackQueue; - if (isUseStackQueue) { - isPrepareGrabPos = true; - } else if (isAndroid) { - attachThreadIfNeed(true, &isAndroidThreadAttached, &runtimeJNIEnvPtr_ANDROID); - getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID); - - isPrepareGrabPos = true; + if (isAndroid) { + attachThread(true, &runtimeJNIEnvPtr_ANDROID); } else { - attachThreadIfNeed(false, &isRuntimeThreadAttached, &dalvikJNIEnvPtr_JRE); + attachThread(false, &dalvikJNIEnvPtr_JRE); // getJavaInputBridge(&inputBridgeClass_JRE, &inputBridgeMethod_JRE); } + + if (isUseStackQueue && isAndroid) { + isPrepareGrabPos = true; + getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID); + } } JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) { diff --git a/app/src/main/jni/utils.h b/app/src/main/jni/utils.h index cbb8e203f..443058728 100644 --- a/app/src/main/jni/utils.h +++ b/app/src/main/jni/utils.h @@ -13,7 +13,7 @@ JNIEnv* dalvikJNIEnvPtr_JRE; long showingWindow; -bool isAndroidThreadAttached, isRuntimeThreadAttached, isInputReady, isCursorEntered, isPrepareGrabPos; +bool isInputReady, isCursorEntered, isPrepareGrabPos; char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray); jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows);