EddyVerbruggen
diff --git a/‎platforms/android/firebase-release.aar‎
38 Bytes b/‎platforms/android/firebase-release.aar‎
38 Bytes
diff --git a/‎platforms/android/libraryproject/firebase/src/main/java/org/nativescript/plugins/firebase/MyFirebaseMessagingService.java‎
Lines changed: 3 additions & 1 deletion b/‎platforms/android/libraryproject/firebase/src/main/java/org/nativescript/plugins/firebase/MyFirebaseMessagingService.java‎
Lines changed: 3 additions & 1 deletion
@@ -27,9 +27,11 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
       }
 
       final Map<String, String> data = remoteMessage.getData();
+      final JSONObject data_json = new JSONObject();
       for (Map.Entry<String, String> stringStringEntry : data.entrySet()) {
-        json.put(stringStringEntry.getKey(), stringStringEntry.getValue());
+        data_json.put(stringStringEntry.getKey(), stringStringEntry.getValue());
       }
+      json.put("data", data_json);
 
       FirebasePlugin.executeOnNotificationReceivedCallback(json.toString());
     } catch (JSONException e) {
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,11 @@ public void onMessageReceived(RemoteMessage remoteMessage) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`final Map<String, String> data = remoteMessage.getData();`
	`30`	`+ final JSONObject data_json = new JSONObject();`
`30`	`31`	`for (Map.Entry<String, String> stringStringEntry : data.entrySet()) {`
`31`		`- json.put(stringStringEntry.getKey(), stringStringEntry.getValue());`
	`32`	`+ data_json.put(stringStringEntry.getKey(), stringStringEntry.getValue());`
`32`	`33`	`}`
	`34`	`+ json.put("data", data_json);`
`33`	`35`
`34`	`36`	`FirebasePlugin.executeOnNotificationReceivedCallback(json.toString());`
`35`	`37`	`} catch (JSONException e) {`