Fixed: Catch IllegalStateException "Broadcast already finished" and any other exceptions thrown while finishing ResultSender

agnostic-apollo · agnostic-apollo · commit 4c5c27bbad3e · 2022-03-14T23:25:53.000+05:00
diff --git a/app/src/main/java/com/termux/api/util/ResultReturner.java b/app/src/main/java/com/termux/api/util/ResultReturner.java
@@ -190,10 +190,14 @@ public static void returnData(Object context, final Intent intent, final ResultW
                     activity.setResult(1);
                 }
             } finally {
-                if (asyncResult != null) {
-                    asyncResult.finish();
-                } else if (activity != null) {
-                    activity.finish();
+                try {
+                    if (asyncResult != null) {
+                        asyncResult.finish();
+                    } else if (activity != null) {
+                        activity.finish();
+                    }
+                } catch (Exception e) {
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to cleanup", e);
                 }
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,14 @@ public static void returnData(Object context, final Intent intent, final ResultW`
`190`	`190`	`activity.setResult(1);`
`191`	`191`	`}`
`192`	`192`	`} finally {`
`193`		`- if (asyncResult != null) {`
`194`		`- asyncResult.finish();`
`195`		`- } else if (activity != null) {`
`196`		`- activity.finish();`
	`193`	`+ try {`
	`194`	`+ if (asyncResult != null) {`
	`195`	`+ asyncResult.finish();`
	`196`	`+ } else if (activity != null) {`
	`197`	`+ activity.finish();`
	`198`	`+ }`
	`199`	`+ } catch (Exception e) {`
	`200`	`+ Logger.logStackTraceWithMessage(LOG_TAG, "Failed to cleanup", e);`
`197`	`201`	`}`
`198`	`202`	`}`
`199`	`203`	`};`