Merge branch 'v2.0.x' of https://github.com/phonegap/phonegap-plugin-…

…push into v2.0.x

docs/PAYLOAD.md

@@ -401,22 +401,31 @@ Finally the Material UI guidelines recommend using a circular icon for the large
 }
 ```
 
-Here is an example using node-gcm that sends the above JSON:
+Here is an example using fcm-node that sends the above JSON:
 
 ```javascript
-var gcm = require('node-gcm');
+var FCM = require('fcm-node');
 // Replace these with your own values.
 var apiKey = "replace with API key";
 var deviceID = "my device id";
-var service = new gcm.Sender(apiKey);
-var message = new gcm.Message();
-message.addData('title', 'Large Circular Icon');
-message.addData('message', 'Loaded from URL');
-message.addData('image', 'https://pbs.twimg.com/profile_images/837060031895896065/VHIQ4oUf_400x400.jpg');
-message.addData('image-type', 'circular');
-service.send(message, { registrationTokens: [ deviceID ] }, function (err, response) {
-	if(err) console.error(err);
-	else 	console.log(response);
+var fcm = new FCM(apiKey);
+
+var message = {
+    to: deviceID,
+    data: {
+        title: 'Large Icon',
+        message: 'Loaded from URL',
+        image: 'https://dl.dropboxusercontent.com/u/887989/antshot.png'
+    }
+};
+
+fcm.send(message, function(err, response){
+  if (err) {
+    console.log(err);
+    console.log("Something has gone wrong!");
+  } else {
+    console.log("Successfully sent with response: ", response);
+  }
 });
 ```
 

package.json

@@ -1,7 +1,10 @@
 {
   "name": "phonegap-plugin-push",
   "description": "Register and receive push notifications.",
+<<<<<<< HEAD
   "types": "./types/index.d.ts",
+=======
+>>>>>>> 3a1806aaec5d3c76f7fcd30ddfd85d576fb6d197
   "version": "2.0.0-rc2",
   "homepage": "http://github.com/phonegap/phonegap-plugin-push#readme",
   "repository": {

src/android/com/adobe/phonegap/push/FCMService.java

@@ -80,6 +80,18 @@ public void onMessageReceived(RemoteMessage message){
             extras.putString(entry.getKey(), entry.getValue());
         }
 
+        Log.d(LOG_TAG, "onMessage - from: " + message.getFrom());
+
+        Bundle extras = new Bundle();
+
+        if (message.getNotification()!=null) {
+            extras.putString(TITLE,message.getNotification().getTitle());
+            extras.putString(MESSAGE,message.getNotification().getBody());
+        }
+        for (Map.Entry<String, String> entry : message.getData().entrySet()) {
+            extras.putString(entry.getKey(), entry.getValue());
+        }
+
         if (extras != null && isAvailableSender(from)) {
             Context applicationContext = getApplicationContext();