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

call Activity.onActivityResult() directly

Browse Source 
this method must be called before onResume()
This commit is contained in:
Julian Winkler
2024-08-29 13:43:47 +02:00
parent c492e1f03f
commit 265ac895d3
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,6 @@ public class Activity extends ContextThemeWrapper implements Window.Callback {
public Intent intent; public Intent intent;
private Activity resultActivity; private Activity resultActivity;
private int resultRequestCode; private int resultRequestCode;
private int pendingRequestCode;
private int pendingResultCode;
private Intent pendingData;
private boolean paused = false; private boolean paused = false;
private CharSequence title = null; private CharSequence title = null;
List<Fragment> fragments = new ArrayList<>(); List<Fragment> fragments = new ArrayList<>();
@@ -171,10 +168,6 @@ public class Activity extends ContextThemeWrapper implements Window.Callback {
protected void onResume() { protected void onResume() {
System.out.println("- onResume - yay!"); System.out.println("- onResume - yay!");
if (pendingData != null) {
onActivityResult(pendingRequestCode, pendingResultCode, pendingData);
pendingData = null;
}
for (Fragment fragment : fragments) { for (Fragment fragment : fragments) {
fragment.onResume(); fragment.onResume();
@@ -329,9 +322,7 @@ public class Activity extends ContextThemeWrapper implements Window.Callback {
public void setResult(int resultCode, Intent data) { public void setResult(int resultCode, Intent data) {
if (resultActivity != null) { if (resultActivity != null) {
resultActivity.pendingRequestCode = resultRequestCode; resultActivity.onActivityResult(resultRequestCode, resultCode, data);
resultActivity.pendingResultCode = resultCode;
resultActivity.pendingData = data;
} }
} }