From f872d87115a2fe187eed28dd4e6152080685b93d Mon Sep 17 00:00:00 2001 From: Jonathan Poltak Samosir Date: Mon, 20 May 2024 11:09:31 +0700 Subject: [PATCH] Only call finish on Android activity if not null --- .../java/com/alinz/parkerdan/shareextension/ShareModule.java | 5 ++++- .../alinz/reactNativeShareExtension/ShareExModule.java | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/alinz/parkerdan/shareextension/ShareModule.java b/android/src/main/java/com/alinz/parkerdan/shareextension/ShareModule.java index e1aea2ce..40aabff4 100644 --- a/android/src/main/java/com/alinz/parkerdan/shareextension/ShareModule.java +++ b/android/src/main/java/com/alinz/parkerdan/shareextension/ShareModule.java @@ -29,7 +29,10 @@ public String getName() { @ReactMethod public void close() { - getCurrentActivity().finish(); + Activity currentActivity = getCurrentActivity(); + if (currentActivity != null) { + currentActivity.finish(); + } } @ReactMethod diff --git a/android/src/main/java/com/github/alinz/reactNativeShareExtension/ShareExModule.java b/android/src/main/java/com/github/alinz/reactNativeShareExtension/ShareExModule.java index 5409cb05..864233c8 100644 --- a/android/src/main/java/com/github/alinz/reactNativeShareExtension/ShareExModule.java +++ b/android/src/main/java/com/github/alinz/reactNativeShareExtension/ShareExModule.java @@ -59,8 +59,9 @@ protected WritableMap processIntent() { @ReactMethod public void close() { Activity currentActivity = getCurrentActivity(); - - currentActivity.finish(); + if (currentActivity != null) { + currentActivity.finish(); + } } public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { }