Update FIRMessagingModule.java

1380a06d · Libin Lu · GitHub · 27628be0 · 1380a06d
Commit 1380a06d authored Sep 25, 2017 by Libin Lu Committed by GitHub Sep 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java ...rc/main/java/com/evollu/react/fcm/FIRMessagingModule.java +2 -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
@@ -57,11 +57,11 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
    @ReactMethod
    public void getInitialNotification(Promise promise){
        Activity activity = getCurrentActivity();
-        if(activity == null){
+        if(activity == null || activity.getIntent().getAction() == "android.intent.action.MAIN"){
            promise.resolve(null);
            return;
        }
-        promise.resolve(parseIntent(getCurrentActivity().getIntent()));
+        promise.resolve(parseIntent(activity.getIntent()));
    }

    @ReactMethod