From 25fcb066a7e4a5a122c9756eda89700e2e915eb6 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 2 Dec 2022 18:47:40 +0200
Subject: [PATCH] Fix Android crash when push notification is received and app
 not initialized (#6817)

---
 .../java/com/mattermost/rnbeta/CustomPushNotification.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
index 48a664f7e4..ea95fb38bc 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -81,7 +81,8 @@ public class CustomPushNotification extends PushNotification {
         switch (type) {
             case CustomPushNotificationHelper.PUSH_TYPE_MESSAGE:
             case CustomPushNotificationHelper.PUSH_TYPE_SESSION:
-                String currentActivityName = ShareModule.getInstance().getCurrentActivityName();
+                ShareModule shareModule = ShareModule.getInstance();
+                String currentActivityName = shareModule != null ? shareModule.getCurrentActivityName() : "";
                 Log.i("ReactNative", currentActivityName);
                 if (!mAppLifecycleFacade.isAppVisible() || !currentActivityName.equals("MainActivity")) {
                     boolean createSummary = type.equals(CustomPushNotificationHelper.PUSH_TYPE_MESSAGE);