Skip to content

Avoid crash dismissing a Modal whose Activity was destroyed #59233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Abbondanzo wants to merge 1 commit into from
Closed

Avoid crash dismissing a Modal whose Activity was destroyed #59233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,14 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
val dialogContext =
ContextUtils.findContextOfType(nonNullDialog.context, Activity::class.java)
if (dialogContext == null || !dialogContext.isFinishing) {
nonNullDialog.dismiss()
// A destroyed Activity (e.g. relaunched on a configuration change without finishing) has
// already removed the dialog's window, so dismissing it would throw.
if (dialogContext == null || !(dialogContext.isFinishing || dialogContext.isDestroyed)) {
try {
nonNullDialog.dismiss()
} catch (e: IllegalArgumentException) {
FLog.e(TAG, "ReactModalHostView: error while dismissing dialog: ", e.message)
}
}
}
dialog = null
Expand Down
Loading