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

Activity: make startActivityForResult() functional

Browse Source
This commit is contained in:
Julian Winkler
2023-08-22 13:23:34 +02:00
parent 3399c84e84
commit 9bd5593657
2 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,11 @@ public class Activity extends Context {
Window window = new Window();
int requested_orientation = -1 /*ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED*/; // dummy
private Intent intent;
private Activity resultActivity;
private int resultRequestCode;
private int pendingRequestCode;
private int pendingResultCode;
private Intent pendingData;
/**
* Helper function to be called from native code to construct main activity
@@ -124,6 +129,10 @@ public class Activity extends Context {
protected void onResume() {
System.out.println("- onResume - yay!");
if (pendingData != null) {
onActivityResult(pendingRequestCode, pendingResultCode, pendingData);
pendingData = null;
}
return;
}
@@ -235,6 +244,8 @@ public class Activity extends Context {
Activity activity = constructor.newInstance();
activity.intent = intent;
activity.getWindow().native_window = getWindow().native_window;
activity.resultRequestCode = requestCode;
activity.resultActivity = this;
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
@@ -245,6 +256,14 @@ public class Activity extends Context {
}
}
public void setResult(int resultCode, Intent data) {
if (resultActivity != null) {
resultActivity.pendingRequestCode = resultRequestCode;
resultActivity.pendingResultCode = resultCode;
resultActivity.pendingData = data;
}
}
public void startActivity(Intent intent) {
System.out.println("startActivity(" + intent + ") called");
try {