From c9b93dfcc87bf3549a72dd0f00b80712b1445435 Mon Sep 17 00:00:00 2001
From: Libin Lu <llu@evolenthealth.com>
Date: Tue, 13 Sep 2016 17:15:39 -0400
Subject: [PATCH] take away FCM.initData

---
 .../evollu/react/fcm/FIRMessagingModule.java  | 16 +--------
 index.js                                      | 33 ++++++++-----------
 ios/RNFIRMesssaging.m                         |  6 ----
 3 files changed, 14 insertions(+), 41 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 0a418ad..2ff7c6d 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -27,15 +27,13 @@ import android.util.Log;
 import android.content.Context;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 public class FIRMessagingModule extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
     private final static String TAG = FIRMessagingModule.class.getCanonicalName();
     private FIRLocalMessagingHelper mFIRLocalMessagingHelper;
-    Intent initIntent;
-
+    
     public FIRMessagingModule(ReactApplicationContext reactContext) {
         super(reactContext);
         mFIRLocalMessagingHelper = new FIRLocalMessagingHelper((Application) reactContext.getApplicationContext());
@@ -45,12 +43,6 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
         registerMessageHandler();
     }
 
-    @Override
-    public Map<String, Object> getConstants() {
-        Map<String, Object> constants = new HashMap<>();
-        return constants;
-    }
-
     @Override
     public String getName() {
         return "RNFIRMessaging";
@@ -180,12 +172,6 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
 
     @Override
     public void onHostResume() {
-        if (initIntent == null){
-            //the first intent is initial intent that opens the app
-            Intent newIntent = getCurrentActivity().getIntent();
-            sendEvent("FCMInitData", parseIntent(newIntent));
-            initIntent = newIntent;
-        }
     }
 
     @Override
diff --git a/index.js b/index.js
index 69b24f2..b559434 100644
--- a/index.js
+++ b/index.js
@@ -6,48 +6,48 @@ const eventsMap = {
     localNotification: 'FCMLocalNotificationReceived'
 };
 
-const FIRMessaging = NativeModules.RNFIRMessaging;
+const RNFIRMessaging = NativeModules.RNFIRMessaging;
 
 const FCM = {};
 
 FCM.getInitialNotification = () => {
-    return FIRMessaging.getInitialNotification();
+    return RNFIRMessaging.getInitialNotification();
 }
 
 FCM.getFCMToken = () => {
-    return FIRMessaging.getFCMToken();
+    return RNFIRMessaging.getFCMToken();
 };
 
 FCM.requestPermissions = () => {
-    return FIRMessaging.requestPermissions();
+    return RNFIRMessaging.requestPermissions();
 };
 
 FCM.presentLocalNotification = (details) => {
-    FIRMessaging.presentLocalNotification(details);
+    RNFIRMessaging.presentLocalNotification(details);
 };
 
 FCM.scheduleLocalNotification = function(details) {
-    FIRMessaging.scheduleLocalNotification(details);
+    RNFIRMessaging.scheduleLocalNotification(details);
 };
 
 FCM.getScheduledLocalNotifications = function() {
-    return FIRMessaging.getScheduledLocalNotifications();
+    return RNFIRMessaging.getScheduledLocalNotifications();
 };
 
 FCM.cancelLocalNotification = (notificationID) => {
-    FIRMessaging.cancelLocalNotification(notificationID);
+    RNFIRMessaging.cancelLocalNotification(notificationID);
 };
 
 FCM.cancelAllLocalNotifications = () => {
-    FIRMessaging.cancelAllLocalNotifications();
+    RNFIRMessaging.cancelAllLocalNotifications();
 };
 
 FCM.setBadgeNumber = () => {
-    FIRMessaging.setBadgeNumber();
+    RNFIRMessaging.setBadgeNumber();
 }
 
 FCM.getBadgeNumber = () => {
-    return FIRMessaging.getBadgeNumber();
+    return RNFIRMessaging.getBadgeNumber();
 }
 
 FCM.on = (event, callback) => {
@@ -60,18 +60,11 @@ FCM.on = (event, callback) => {
 };
 
 FCM.subscribeToTopic = (topic) => {
-    FIRMessaging.subscribeToTopic(topic);
+    RNFIRMessaging.subscribeToTopic(topic);
 };
 
 FCM.unsubscribeFromTopic = (topic) => {
-    FIRMessaging.unsubscribeFromTopic(topic);
+    RNFIRMessaging.unsubscribeFromTopic(topic);
 };
 
-//once doesn't seem to work
-DeviceEventEmitter.addListener('FCMInitData', (data) => {
-    FCM.initialData = data;
-});
-
-FCM.initialData = FIRMessaging.initialData;
-
 module.exports = FCM;
diff --git a/ios/RNFIRMesssaging.m b/ios/RNFIRMesssaging.m
index 11eab33..0bac0d4 100644
--- a/ios/RNFIRMesssaging.m
+++ b/ios/RNFIRMesssaging.m
@@ -72,12 +72,6 @@ RCT_EXPORT_MODULE()
 
 @synthesize bridge = _bridge;
 
-- (NSDictionary<NSString *, id> *)constantsToExport
-{
-  NSDictionary<NSString *, id> *initialNotification = [_bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] copy];
-  return @{@"initialData": RCTNullIfNil(initialNotification)};
-}
-
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-- 
2.26.2