From d6e01cf8595cf8ac6556562a6c988f7fb266c0fb Mon Sep 17 00:00:00 2001
From: Simon MacDonald <simon.macdonald@gmail.com>
Date: Thu, 24 Nov 2016 17:13:59 -0500
Subject: [PATCH] Refactor GCMIntentService to FCMService

---
 plugin.xml                                                    | 4 ++--
 .../adobe/phonegap/push/BackgroundActionButtonHandler.java    | 2 +-
 .../phonegap/push/{GCMIntentService.java => FCMService.java}  | 2 +-
 src/android/com/adobe/phonegap/push/PushHandlerActivity.java  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/android/com/adobe/phonegap/push/{GCMIntentService.java => FCMService.java} (99%)

diff --git a/plugin.xml b/plugin.xml
index a136e7e54..6a026b4ca 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -52,7 +52,7 @@
 			<activity android:name="com.adobe.phonegap.push.PushHandlerActivity" android:exported="true"/>
             <receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler"/>
             <service
-                android:name="com.adobe.phonegap.push.GCMIntentService">
+                android:name="com.adobe.phonegap.push.FCMService">
                 <intent-filter>
                     <action android:name="com.google.firebase.MESSAGING_EVENT" />
                 </intent-filter>
@@ -70,7 +70,7 @@
         <framework src="me.leolin:ShortcutBadger:1.1.11@aar"/>
         <framework src="com.google.firebase:firebase-messaging:9+" />
 
-		<source-file src="src/android/com/adobe/phonegap/push/GCMIntentService.java" target-dir="src/com/adobe/phonegap/push/" />
+		<source-file src="src/android/com/adobe/phonegap/push/FCMService.java" target-dir="src/com/adobe/phonegap/push/" />
 		<source-file src="src/android/com/adobe/phonegap/push/PushConstants.java" target-dir="src/com/adobe/phonegap/push/" />
 		<source-file src="src/android/com/adobe/phonegap/push/PushHandlerActivity.java" target-dir="src/com/adobe/phonegap/push/" />
 		<source-file src="src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.java" target-dir="src/com/adobe/phonegap/push/" />
diff --git a/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java b/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java
index 3ccea6cb5..08658d70d 100644
--- a/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java
+++ b/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java
@@ -19,7 +19,7 @@ public void onReceive(Context context, Intent intent) {
         int notId = intent.getIntExtra(NOT_ID, 0);
         Log.d(LOG_TAG, "not id = " + notId);
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancel(GCMIntentService.getAppName(context), notId);
+        notificationManager.cancel(FCMService.getAppName(context), notId);
 
         if (extras != null)	{
             Bundle originalExtras = extras.getBundle(PUSH_BUNDLE);
diff --git a/src/android/com/adobe/phonegap/push/GCMIntentService.java b/src/android/com/adobe/phonegap/push/FCMService.java
similarity index 99%
rename from src/android/com/adobe/phonegap/push/GCMIntentService.java
rename to src/android/com/adobe/phonegap/push/FCMService.java
index 902f767e3..52c33125b 100644
--- a/src/android/com/adobe/phonegap/push/GCMIntentService.java
+++ b/src/android/com/adobe/phonegap/push/FCMService.java
@@ -41,7 +41,7 @@
 import java.util.Random;
 
 @SuppressLint("NewApi")
-public class GCMIntentService extends FirebaseMessagingService implements PushConstants {
+public class FCMService extends FirebaseMessagingService implements PushConstants {
 
     private static final String LOG_TAG = "PushPlugin_FCMService";
     private static HashMap<Integer, ArrayList<String>> messageMap = new HashMap<Integer, ArrayList<String>>();
diff --git a/src/android/com/adobe/phonegap/push/PushHandlerActivity.java b/src/android/com/adobe/phonegap/push/PushHandlerActivity.java
index e44832ef4..18eea9ecc 100644
--- a/src/android/com/adobe/phonegap/push/PushHandlerActivity.java
+++ b/src/android/com/adobe/phonegap/push/PushHandlerActivity.java
@@ -21,7 +21,7 @@ public class PushHandlerActivity extends Activity implements PushConstants {
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        GCMIntentService gcm = new GCMIntentService();
+        FCMService gcm = new FCMService();
 
         Intent intent = getIntent();
 
@@ -37,7 +37,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         if(!startOnBackground){
             NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.cancel(GCMIntentService.getAppName(this), notId);
+            notificationManager.cancel(FCMService.getAppName(this), notId);
         }
 
         Log.d(LOG_TAG, "bringToForeground = " + foreground);