Only call finish on Android activity if not null

WorldBrain · May 20, 2024 · f872d87 · f872d87
1 parent f0e9cd9
commit f872d87
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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) { }