diff --git a/android/react-native-fcm.iml b/android/react-native-fcm.iml
index 17bc181efa4dd31c7f4e2a87eb5f0ad299054898..be7ba28ccf5a5a33a2ca529e1b60dd277956e087 100644
--- a/android/react-native-fcm.iml
+++ b/android/react-native-fcm.iml
@@ -101,35 +101,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 7878692aec9fca17c9218378335cd60ba47914c0..6f62c549f7fcf00d370e35a16a932e522427fb68 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -51,6 +51,11 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
@ReactMethod
public void getInitialNotification(Promise promise){
+ Activity activity = getCurrentActivity();
+ if(activity == null){
+ promise.resolve(null);
+ return;
+ }
promise.resolve(parseIntent(getCurrentActivity().getIntent()));
}
@@ -136,14 +141,14 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
RemoteMessage message = intent.getParcelableExtra("data");
WritableMap params = Arguments.createMap();
if(message.getData() != null){
- Map data = message.getData();
+ Map data = message.getData();
Set keysIterator = data.keySet();
for(String key: keysIterator){
params.putString(key, (String) data.get(key));
}
- sendEvent("FCMNotificationReceived", params);
- abortBroadcast();
}
+ sendEvent("FCMNotificationReceived", params);
+ abortBroadcast();
}
}