diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-11-05 09:34:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 09:34:01 -0700 |
commit | fb26fa078fc3299112108a682004f41e767d397b (patch) | |
tree | ef6d4bc4fa9f2b883dc7fc6512476281a0d1e45e /src/main/java/org/traccar/notificators/NotificatorFirebase.java | |
parent | 54e0ed6aa3fb39c344a2aaf68eb0b03967e912ef (diff) | |
parent | c370aa660d216980a0c8f52ca856b4116ff5ca23 (diff) | |
download | trackermap-server-fb26fa078fc3299112108a682004f41e767d397b.tar.gz trackermap-server-fb26fa078fc3299112108a682004f41e767d397b.tar.bz2 trackermap-server-fb26fa078fc3299112108a682004f41e767d397b.zip |
Merge pull request #4763 from wkhaksar/push-notifications-title
Title for push notifications
Diffstat (limited to 'src/main/java/org/traccar/notificators/NotificatorFirebase.java')
-rw-r--r-- | src/main/java/org/traccar/notificators/NotificatorFirebase.java | 8 |
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 78d5da1e2..f91ec25a0 100644 --- a/src/main/java/org/traccar/notificators/NotificatorFirebase.java +++ b/src/main/java/org/traccar/notificators/NotificatorFirebase.java @@ -24,6 +24,7 @@ import org.traccar.config.Keys; import org.traccar.model.Event; import org.traccar.model.Position; import org.traccar.model.User; +import org.traccar.notification.NotificationMessage; import org.traccar.notification.NotificationFormatter; import javax.ws.rs.client.Entity; @@ -37,6 +38,8 @@ public class NotificatorFirebase extends Notificator { private final String key; public static class Notification { + @JsonProperty("title") + private String title; @JsonProperty("body") private String body; @JsonProperty("sound") @@ -66,8 +69,11 @@ public class NotificatorFirebase extends Notificator { final User user = Context.getPermissionsManager().getUser(userId); if (user.getAttributes().containsKey("notificationTokens")) { + NotificationMessage shortMessage = NotificationFormatter.formatMessage(userId, event, position, "short"); + Notification notification = new Notification(); - notification.body = NotificationFormatter.formatShortMessage(userId, event, position).trim(); + notification.title = shortMessage.getSubject(); + notification.body = shortMessage.getBody(); notification.sound = "default"; Message message = new Message(); |