fix null issue

504a674b · Libin Lu · GitHub · ca7143a4 · 504a674b
Commit 504a674b authored Sep 27, 2017 by Libin Lu Committed by GitHub Sep 27, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java ...rc/main/java/com/evollu/react/fcm/FIRMessagingModule.java +6 -2

No files found.
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -58,12 +58,16 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
    @ReactMethod
    public void getInitialNotification(Promise promise){
        Activity activity = getCurrentActivity();
+        if(activity == null){
+            promise.resolve(null);
+            return;
+        }
        Intent intent = activity.getIntent();
-        if(activity == null || (intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN"))){
+        if(intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN")){
            promise.resolve(null);
            return;
        }
-        promise.resolve(parseIntent(activity.getIntent()));
+        promise.resolve(parseIntent(intent));
    }
    
    @ReactMethod