1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/notificators/NotificatorFirebase.java b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
index ecf3fbb70..3723a4226 100644
--- a/src/main/java/org/traccar/notificators/NotificatorFirebase.java
+++ b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
@@ -80,10 +80,16 @@ public class NotificatorFirebase implements Notificator {
                                     .build())
                             .build())
                     .addAllTokens(registrationTokens)
+                    .putData("eventId", String.valueOf(event.getId()))
                     .build();
 
             try {
-                FirebaseMessaging.getInstance().sendMulticast(message);
+                var result = FirebaseMessaging.getInstance().sendMulticast(message);
+                for (var response : result.getResponses()) {
+                    if (!response.isSuccessful()) {
+                        throw new MessageException(response.getException());
+                    }
+                }
             } catch (FirebaseMessagingException e) {
                 throw new MessageException(e);
             }