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

6
src/api-impl/android/app/Activity.java
View File

@@ -110,6 +110,8 @@ public class Activity extends Context {
protected void onStart() {
System.out.println("- onStart - yay!");
if (window.contentView != null)
window.setContentView(window.contentView);
return;
}
@@ -232,7 +234,7 @@ public class Activity extends Context {
Constructor<? extends Activity> constructor = cls.getConstructor();
Activity activity = constructor.newInstance();
activity.intent = intent;
activity.window = getWindow();
activity.getWindow().native_window = getWindow().native_window;
nativeStartActivity(activity);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
onActivityResult(requestCode, 0 /*RESULT_CANCELED*/, new Intent()); // RESULT_CANCELED is the only pre-defined return value, so hopefully it works out for us
@@ -250,7 +252,7 @@ public class Activity extends Context {
Constructor<? extends Activity> constructor = cls.getConstructor();
Activity activity = constructor.newInstance();
activity.intent = intent;
activity.window = getWindow();
activity.getWindow().native_window = getWindow().native_window;
nativeStartActivity(activity);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
e.printStackTrace();