From 265ac895d3c957ee16ac3df0cd1e0d22d51cc740 Mon Sep 17 00:00:00 2001
From: Julian Winkler <julian.winkler1@web.de>
Date: Thu, 29 Aug 2024 13:43:47 +0200
Subject: [PATCH] call Activity.onActivityResult() directly

this method must be called before onResume()
---
 src/api-impl/android/app/Activity.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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