Issue #343: Handle both data and notification payloads in the same GC…

…M push
phonegap · Nov 18, 2015 · e96d38d · e96d38d
1 parent 586ea7a
commit e96d38d
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/android/com/adobe/phonegap/push/GCMIntentService.java b/src/android/com/adobe/phonegap/push/GCMIntentService.java
@@ -141,7 +141,7 @@ private Bundle normalizeExtras(Bundle extras) {
 
             Log.d(LOG_TAG, "key = " + key);
 
-            // If the key is "data" or "message" and the value is a json object extract
+            // If normalizeKeythe key is "data" or "message" and the value is a json object extract
             // This is to support parse.com and other services. Issue #147 and pull #218
             if (key.equals(PARSE_COM_DATA) || key.equals(MESSAGE)) {
                 Object json = extras.get(key);
@@ -167,6 +167,19 @@ private Bundle normalizeExtras(Bundle extras) {
                         Log.e(LOG_TAG, "normalizeExtras: JSON exception");
                     }
                 }
+            } else if (key.equals(("notification"))) {
+                Bundle value = extras.getBundle(key);
+                Iterator<String> iterator = value.keySet().iterator();
+                while (iterator.hasNext()) {
+                    String notifkey = iterator.next();
+
+                    Log.d(LOG_TAG, "notifkey = " + notifkey);
+                    String newKey = normalizeKey(notifkey);
+                    Log.d(LOG_TAG, "replace key " + notifkey + " with " + newKey);
+
+                    newExtras.putString(newKey, value.getString(notifkey));
+                }
+                continue;
             }
 
             String newKey = normalizeKey(key);