Archive/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-04-28 12:17:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Activity: fix crash when finish() is called from onResume()

Browse source
This commit is contained in:
Julian Winkler 2025-04-21 07:47:44 +02:00
parent e652089252
commit 68b8af1e1c
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api-impl-jni/app/android_app_Activity.c
View file

@ -44,19 +44,27 @@ static void activity_unfocus(JNIEnv *env, jobject activity)
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
} }
static jobject removed_activity = NULL;
static void activity_focus(JNIEnv *env, jobject activity) static void activity_focus(JNIEnv *env, jobject activity)
{ {
(*env)->CallVoidMethod(env, activity, handle_cache.activity.onStart); (*env)->CallVoidMethod(env, activity, handle_cache.activity.onStart);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
if (activity == removed_activity)
return;
(*env)->CallVoidMethod(env, activity, handle_cache.activity.onResume); (*env)->CallVoidMethod(env, activity, handle_cache.activity.onResume);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
if (activity == removed_activity)
return;
(*env)->CallVoidMethod(env, activity, handle_cache.activity.onPostResume); (*env)->CallVoidMethod(env, activity, handle_cache.activity.onPostResume);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
if (activity == removed_activity)
return;
(*env)->CallVoidMethod(env, activity, handle_cache.activity.onWindowFocusChanged, true); (*env)->CallVoidMethod(env, activity, handle_cache.activity.onWindowFocusChanged, true);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
@ -73,6 +81,8 @@ static void activity_update_current(JNIEnv *env)
if (activity_new) if (activity_new)
activity_focus(env, activity_new); activity_focus(env, activity_new);
if (activity_new == removed_activity)
return;
activity_current = activity_new; activity_current = activity_new;
} }
@ -164,7 +174,7 @@ void activity_start(JNIEnv *env, jobject activity_object)
JNIEXPORT void JNICALL Java_android_app_Activity_nativeFinish(JNIEnv *env, jobject this, jlong window) JNIEXPORT void JNICALL Java_android_app_Activity_nativeFinish(JNIEnv *env, jobject this, jlong window)
{ {
GList *l; GList *l;
jobject removed_activity = NULL; removed_activity = NULL;
for (l = activity_backlog; l != NULL; l = l->next) { for (l = activity_backlog; l != NULL; l = l->next) {
if ((*env)->IsSameObject(env, this, l->data)) { if ((*env)->IsSameObject(env, this, l->data)) {
removed_activity = l->data; removed_activity = l->data;