...

app/src/main/java/com/base/filerecoveryrecyclebin/fcm/MessagingService.java

@@ -11,6 +11,9 @@ import com.base.filerecoveryrecyclebin.utils.EventUtils;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.Map;
 
 @SuppressLint("MissingFirebaseInstanceTokenRefresh")
@@ -25,7 +28,24 @@ public class MessagingService extends FirebaseMessagingService {
 //        manageTimerBasedOnMessage(remoteMessage.getData());
 
 //        AdDisplayUtils.getInstance().saveSp();
-        EventUtils.INSTANCE.event("FCM_Received", null, null, false);
+
+        String id = remoteMessage.getMessageId();
+        JSONObject ext = new JSONObject();
+        try {
+            ext.put("getMessageType", remoteMessage.getMessageType());
+            ext.put("getData", remoteMessage.getData());
+            ext.put("getCollapseKey", remoteMessage.getCollapseKey());
+            ext.put("getFrom", remoteMessage.getFrom());
+            ext.put("getPriority", remoteMessage.getPriority());
+            ext.put("getSenderId", remoteMessage.getSenderId());
+            ext.put("getSentTime", remoteMessage.getSentTime());
+        } catch (JSONException e) {
+            EventUtils.INSTANCE.event("FCM_Received_Error", id, ext, false);
+            throw new RuntimeException(e);
+        } finally {
+        }
+        EventUtils.INSTANCE.event("FCM_Received", id, ext, false);
+
         sendLocalNotification();
     }