strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: We also need to DetachCurrentThread().

Browse source 
And clean the exceptions too, otherwise we get failures in GetMethodID.

Change-Id: Id636002dd9d32cb7ea0db8ad906b11619f38ef36
This commit is contained in:
Jan Holesovsky 2019-06-19 21:12:41 +02:00
parent 297a4857ad
commit fe9b3d69d5
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/app/src/main/cpp/androidapp.cpp
View file

@ -112,7 +112,7 @@ static void send2JS(jclass mainActivityClz, jobject mainActivityObj, const std::
JNIEnv *env;
jint res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
if (res != JNI_OK) {
if (res == JNI_EDETACHED) {
LOG_DBG("GetEnv need to attach thread");
res = javaVM->AttachCurrentThread(&env, nullptr);
if (JNI_OK != res) {
@ -120,10 +120,23 @@ static void send2JS(jclass mainActivityClz, jobject mainActivityObj, const std::
return;
}
}
else if (res == JNI_EVERSION) {
LOG_DBG("GetEnv version not supported");
return;
}
else if (res != JNI_OK) {
LOG_DBG("GetEnv another error");
return;
}
jstring jstr = env->NewStringUTF(js.c_str());
jmethodID callFakeWebsocket = env->GetMethodID(mainActivityClz, "callFakeWebsocketOnMessage", "(Ljava/lang/String;)V");
env->CallVoidMethod(mainActivityObj, callFakeWebsocket, jstr);
if (env->ExceptionCheck())
env->ExceptionDescribe();
javaVM->DetachCurrentThread();
}
/// Handle a message from JavaScript.