From fab556c4eb2f8c3dc5f63ca9dd24e333fa0d13a9 Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Thu, 25 Apr 2019 06:23:16 -0700 Subject: [PATCH] Check for null activity before calling finish (#2738) --- .../app/src/main/java/com/mattermost/share/ShareModule.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/mattermost/share/ShareModule.java b/android/app/src/main/java/com/mattermost/share/ShareModule.java index dd6391ae6..16dcff239 100644 --- a/android/app/src/main/java/com/mattermost/share/ShareModule.java +++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java @@ -75,7 +75,10 @@ public class ShareModule extends ReactContextBaseJavaModule { @ReactMethod public void close(ReadableMap data) { this.clear(); - getCurrentActivity().finish(); + Activity currentActivity = getCurrentActivity(); + if (currentActivity != null) { + currentActivity.finish(); + } if (data != null && data.hasKey("url")) { ReadableArray files = data.getArray("files");