1 files changed, 17 insertions, 19 deletions

diff --git a/src/main/java/org/traccar/notificators/NotificatorFirebase.java b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
index 89031ba26..a4171a1d4 100644
--- a/src/main/java/org/traccar/notificators/NotificatorFirebase.java
+++ b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2024 Anton Tananaev (anton@traccar.org)
  * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,25 +26,25 @@ import com.google.firebase.messaging.Aps;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.MessagingErrorCode;
 import com.google.firebase.messaging.MulticastMessage;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.model.ObjectOperation;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.model.Event;
-import org.traccar.model.Notification;
+import org.traccar.model.ObjectOperation;
 import org.traccar.model.Position;
 import org.traccar.model.User;
 import org.traccar.notification.MessageException;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.NotificationMessage;
 import org.traccar.session.cache.CacheManager;
 import org.traccar.storage.Storage;
 import org.traccar.storage.query.Columns;
 import org.traccar.storage.query.Condition;
 import org.traccar.storage.query.Request;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,11 +54,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 @Singleton
-public class NotificatorFirebase implements Notificator {
+public class NotificatorFirebase extends Notificator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorFirebase.class);
-
-    private final NotificationFormatter notificationFormatter;
     private final Storage storage;
     private final CacheManager cacheManager;
 
@@ -67,7 +65,7 @@ public class NotificatorFirebase implements Notificator {
             Config config, NotificationFormatter notificationFormatter,
             Storage storage, CacheManager cacheManager) throws IOException {
 
-        this.notificationFormatter = notificationFormatter;
+        super(notificationFormatter, "short");
         this.storage = storage;
         this.cacheManager = cacheManager;
 
@@ -82,18 +80,16 @@ public class NotificatorFirebase implements Notificator {
     }
 
     @Override
-    public void send(Notification notification, User user, Event event, Position position) throws MessageException {
+    public void send(User user, NotificationMessage message, Event event, Position position) throws MessageException {
         if (user.hasAttribute("notificationTokens")) {
 
-            var shortMessage = notificationFormatter.formatMessage(notification, user, event, position, "short");
-
             List<String> registrationTokens = new ArrayList<>(
                     Arrays.asList(user.getString("notificationTokens").split("[, ]")));
 
-            MulticastMessage message = MulticastMessage.builder()
+            var messageBuilder = MulticastMessage.builder()
                     .setNotification(com.google.firebase.messaging.Notification.builder()
-                            .setTitle(shortMessage.getSubject())
-                            .setBody(shortMessage.getBody())
+                            .setTitle(message.getSubject())
+                            .setBody(message.getBody())
                             .build())
                     .setAndroidConfig(AndroidConfig.builder()
                             .setNotification(AndroidNotification.builder()
@@ -105,12 +101,14 @@ public class NotificatorFirebase implements Notificator {
                                     .setSound("default")
                                     .build())
                             .build())
-                    .addAllTokens(registrationTokens)
-                    .putData("eventId", String.valueOf(event.getId()))
-                    .build();
+                    .addAllTokens(registrationTokens);
+
+            if (event != null) {
+                messageBuilder.putData("eventId", String.valueOf(event.getId()));
+            }
 
             try {
-                var result = FirebaseMessaging.getInstance().sendMulticast(message);
+                var result = FirebaseMessaging.getInstance().sendMulticast(messageBuilder.build());
                 List<String> failedTokens = new LinkedList<>();
                 var iterator = result.getResponses().listIterator();
                 while (iterator.hasNext()) {