From 4fb599002f01fc3dcf8b02a4b3ba6d3d99ea4309 Mon Sep 17 00:00:00 2001
From: Libin Lu <llu@evolenthealth.com>
Date: Sun, 29 May 2016 18:32:02 -0400
Subject: [PATCH] change back package name

---
 README.md                                     |  6 +++---
 android/react-native-fcm.iml                  | 20 ++++++++++---------
 android/src/main/AndroidManifest.xml          |  2 +-
 .../{firebase => fcm}/FIRMessagingModule.java |  6 +++---
 .../FIRMessagingPackage.java                  |  2 +-
 .../{firebase => fcm}/InstanceIdService.java  |  4 ++--
 .../{firebase => fcm}/MessagingService.java   |  4 ++--
 7 files changed, 23 insertions(+), 21 deletions(-)
 rename android/src/main/java/com/evollu/react/{firebase => fcm}/FIRMessagingModule.java (97%)
 rename android/src/main/java/com/evollu/react/{firebase => fcm}/FIRMessagingPackage.java (96%)
 rename android/src/main/java/com/evollu/react/{firebase => fcm}/InstanceIdService.java (89%)
 rename android/src/main/java/com/evollu/react/{firebase => fcm}/MessagingService.java (82%)

diff --git a/README.md b/README.md
index e428098..40d70ca 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' // <- Add this line
 ...
 ```
 
-- In `android/app/src/main/AndroidManifest.xml`, add these lines, be sure to change `com.xxx.yyy` to your package
+- In `android/app/src/main/AndroidManifest.xml`
 
 ```
 <application
@@ -54,7 +54,7 @@ install pod 'Firebase/Messaging'
 
 in AppDelegate.m add
 ```
-#import "FCMModule.h"
+#import "RNFIRMessaging.h"
 ...
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -117,6 +117,6 @@ this.fcmTokenLsnr.remove();
 Try update your SDK and google play service
 ### I can't get data notification when app is killed?
 If you send notification with payload only, you can only get the data message when app is in foreground or background. Killed app can't show notification
-### Why I don't get data notification when I'm sending hybrid notification when app is in background?
+### I can't get data notification when app is in background with hybrid notification
 I want to figure it out too. Looks like that is how GCM/FCM works. I'm sending 2 notification separately for now. Let me know if you find a better solution
 
diff --git a/android/react-native-fcm.iml b/android/react-native-fcm.iml
index 11ebe91..d4e4843 100644
--- a/android/react-native-fcm.iml
+++ b/android/react-native-fcm.iml
@@ -65,14 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,7 +73,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -93,6 +94,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -106,8 +108,8 @@
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
     <orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
     <orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-messaging-9.0.1" level="project" />
     <orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 0411f00..f054d05 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.evollu.react.firebase">
+          package="com.evollu.react.fcm">
 </manifest>
diff --git a/android/src/main/java/com/evollu/react/firebase/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
similarity index 97%
rename from android/src/main/java/com/evollu/react/firebase/FIRMessagingModule.java
rename to android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index 6395ad4..a5354c8 100644
--- a/android/src/main/java/com/evollu/react/firebase/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -1,4 +1,4 @@
-package com.evollu.react.firebase;
+package com.evollu.react.fcm;
 
 import android.content.BroadcastReceiver;
 import android.content.Intent;
@@ -56,7 +56,7 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
     }
 
     private void registerTokenRefreshHandler() {
-        IntentFilter intentFilter = new IntentFilter("com.evollu.react.firebase.FCMRefreshToken");
+        IntentFilter intentFilter = new IntentFilter("com.evollu.react.fcm.FCMRefreshToken");
         getReactApplicationContext().registerReceiver(new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
@@ -74,7 +74,7 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
     }
 
     private void registerNotificationHandler() {
-        IntentFilter intentFilter = new IntentFilter("com.evollu.react.firebase.ReceiveNotification");
+        IntentFilter intentFilter = new IntentFilter("com.evollu.react.fcm.ReceiveNotification");
 
         getReactApplicationContext().registerReceiver(new BroadcastReceiver() {
             @Override
diff --git a/android/src/main/java/com/evollu/react/firebase/FIRMessagingPackage.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
similarity index 96%
rename from android/src/main/java/com/evollu/react/firebase/FIRMessagingPackage.java
rename to android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
index 0c3a7ac..f6ab4e2 100644
--- a/android/src/main/java/com/evollu/react/firebase/FIRMessagingPackage.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
@@ -1,4 +1,4 @@
-package com.evollu.react.firebase;
+package com.evollu.react.fcm;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
diff --git a/android/src/main/java/com/evollu/react/firebase/InstanceIdService.java b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
similarity index 89%
rename from android/src/main/java/com/evollu/react/firebase/InstanceIdService.java
rename to android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
index 0ff5acd..e7da8a1 100644
--- a/android/src/main/java/com/evollu/react/firebase/InstanceIdService.java
+++ b/android/src/main/java/com/evollu/react/fcm/InstanceIdService.java
@@ -1,4 +1,4 @@
-package com.evollu.react.firebase;
+package com.evollu.react.fcm;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,7 +25,7 @@ public class InstanceIdService extends FirebaseInstanceIdService {
 
         // Broadcast refreshed token
 
-        Intent i = new Intent("com.evollu.react.firebase.FCMRefreshToken");
+        Intent i = new Intent("com.evollu.react.fcm.FCMRefreshToken");
         Bundle bundle = new Bundle();
         bundle.putString("token", refreshedToken);
         i.putExtras(bundle);
diff --git a/android/src/main/java/com/evollu/react/firebase/MessagingService.java b/android/src/main/java/com/evollu/react/fcm/MessagingService.java
similarity index 82%
rename from android/src/main/java/com/evollu/react/firebase/MessagingService.java
rename to android/src/main/java/com/evollu/react/fcm/MessagingService.java
index ef609e5..e0d20bd 100644
--- a/android/src/main/java/com/evollu/react/firebase/MessagingService.java
+++ b/android/src/main/java/com/evollu/react/fcm/MessagingService.java
@@ -1,4 +1,4 @@
-package com.evollu.react.firebase;
+package com.evollu.react.fcm;
 
 import android.content.Intent;
 import android.util.Log;
@@ -14,7 +14,7 @@ public class MessagingService extends FirebaseMessagingService {
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         Log.d(TAG, "Remote message received");
-        Intent i = new Intent("com.evollu.react.firebase.ReceiveNotification");
+        Intent i = new Intent("com.evollu.react.fcm.ReceiveNotification");
         i.putExtra("data", remoteMessage);
         sendOrderedBroadcast(i, null);
     }
-- 
2.26.2