From de31a2c12962a73110851ed4a8796fc390435fe6 Mon Sep 17 00:00:00 2001 From: Libin Lu Date: Wed, 27 Sep 2017 08:20:01 -0400 Subject: [PATCH] fix null exception --- .../main/java/com/evollu/react/fcm/FIRMessagingModule.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java index 788a314..459cc7e 100644 --- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java +++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java @@ -58,7 +58,8 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li @ReactMethod public void getInitialNotification(Promise promise){ Activity activity = getCurrentActivity(); - if(activity == null || activity.getIntent().getAction().equals("android.intent.action.MAIN")){ + Intent intent = activity.getIntent(); + if(activity == null || (intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN"))){ promise.resolve(null); return; } @@ -304,7 +305,7 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li @Override public void onNewIntent(Intent intent){ // don't call notification if it is started from icon - if(intent.getAction().equals("android.intent.action.MAIN")){ + if(intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN")){ return; } sendEvent("FCMNotificationReceived", parseIntent(intent)); -- 2.26.2