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);