atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix multi Activity support

Browse Source 
jobjects have to be compared with env->IsSameObject()
and each Activity needs its own Window instance.
The GtkWindow is still shared between all Activities
This commit is contained in:
Julian Winkler
2023-08-22 13:20:04 +02:00
parent 3fd81baeaf
commit 3399c84e84
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api-impl-jni/app/android_app_Activity.c
View File

@@ -86,10 +86,19 @@ void activity_start(JNIEnv *env, jobject activity_object) {
}
JNIEXPORT void JNICALL Java_android_app_Activity_nativeFinish(JNIEnv *env, jobject this, jlong window) {
activity_backlog = g_list_remove(activity_backlog, this);
GList *l;
jobject removed_activity = NULL;
for (l = activity_backlog; l != NULL; l = l->next) {
if ((*env)->IsSameObject(env, this, l->data)) {
removed_activity = l->data;
activity_backlog = g_list_delete_link(activity_backlog, l);
break;
}
}
activity_update_current(env);
activity_close(env, this);
_UNREF(this);
if (removed_activity)
_UNREF(removed_activity);
if (activity_backlog == NULL)
gtk_window_close(GTK_WINDOW(_PTR(window)));
}