Merge pull request #159 from hansemannn/androidFields

feat(android): add notification fields to fcm_data

Author: hansemannn

android/manifest

@@ -3,7 +3,7 @@
 # during compilation, packaging, distribution, etc.
 #
 
-version: 3.4.2
+version: 3.4.3
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-cloud-messaging

android/src/firebase/cloudmessaging/TiFirebaseMessagingService.java

@@ -181,6 +181,18 @@ private Boolean showNotification(RemoteMessage remoteMessage) {
         editor.putString("titanium.firebase.cloudmessaging.message", jsonData.toString());
         editor.commit();
 
+        try {
+            // adding normal notification fields to the fcm_data node
+            if (!remoteMessage.getNotification().getTitle().isEmpty()) {
+                jsonData.put("notification_title", remoteMessage.getNotification().getTitle());
+            }
+            if (!remoteMessage.getNotification().getBody().isEmpty()) {
+                jsonData.put("notification_body", remoteMessage.getNotification().getBody());
+            }
+        } catch (Exception ex) {
+            Log.e(TAG, "Error adding fields: " + ex.getMessage());
+        }
+
         if (!showNotification) {
             // hidden notification - still send broadcast with data for next app start
             Intent i = new Intent();