Refactor GCMIntentService to FCMService

phonegap · Jan 12, 2017 · aa6e3ce · aa6e3ce
1 parent b65fe74
commit aa6e3ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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/...adobe/phonegap/push/GCMIntentService.java → ...d/com/adobe/phonegap/push/FCMService.java b/...adobe/phonegap/push/GCMIntentService.java → ...d/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
@@ -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);
         }
 
         boolean isPushPluginActive = PushPlugin.isActive();