short-message-title-from-templates

27 files changed, 81 insertions, 16 deletions

diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index f037c632f..1411e8a13 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -745,13 +745,6 @@ public final class Keys {
             Collections.singletonList(KeyType.GLOBAL));
 
     /**
-     * Firebase push notifications title.
-     */
-    public static final ConfigKey<String> NOTIFICATOR_FIREBASE_TITLE = new ConfigKey<>(
-            "notificator.firebase.title",
-            Collections.singletonList(KeyType.GLOBAL));
-
-    /**
      * Pushover notification user name.
      */
     public static final ConfigKey<String> NOTIFICATOR_PUSHOVER_USER = new ConfigKey<>(
diff --git a/src/main/java/org/traccar/notification/NotificationFormatter.java b/src/main/java/org/traccar/notification/NotificationFormatter.java
index dabc75b8b..f33961c8b 100644
--- a/src/main/java/org/traccar/notification/NotificationFormatter.java
+++ b/src/main/java/org/traccar/notification/NotificationFormatter.java
@@ -63,7 +63,7 @@ public final class NotificationFormatter {
         return TextTemplateFormatter.formatFullMessage(velocityContext, event.getType());
     }
 
-    public static String formatShortMessage(long userId, Event event, Position position) {
+    public static ShortMessage formatShortMessage(long userId, Event event, Position position) {
         VelocityContext velocityContext = prepareContext(userId, event, position);
         return TextTemplateFormatter.formatShortMessage(velocityContext, event.getType());
     }
diff --git a/src/main/java/org/traccar/notification/ShortMessage.java b/src/main/java/org/traccar/notification/ShortMessage.java
new file mode 100644
index 000000000..a0ee61def
--- /dev/null
+++ b/src/main/java/org/traccar/notification/ShortMessage.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.notification;
+
+public class ShortMessage {
+
+    private String title;
+    private String body;
+
+    public ShortMessage(String subject, String body) {
+        this.title = subject;
+        this.body = body;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getBody() {
+        return body;
+    }
+}
diff --git a/src/main/java/org/traccar/notification/TextTemplateFormatter.java b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
index c7cac2d4d..8a4d35677 100644
--- a/src/main/java/org/traccar/notification/TextTemplateFormatter.java
+++ b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
@@ -76,8 +76,9 @@ public final class TextTemplateFormatter {
         return new FullMessage((String) velocityContext.get("subject"), formattedMessage);
     }
 
-    public static String formatShortMessage(VelocityContext velocityContext, String name) {
-        return formatMessage(velocityContext, name, "short");
+    public static ShortMessage formatShortMessage(VelocityContext velocityContext, String name) {
+        String formattedMessage = formatMessage(velocityContext, name, "short");
+        return new ShortMessage((String) velocityContext.get("title"), formattedMessage);
     }
 
     private static String formatMessage(
diff --git a/src/main/java/org/traccar/notificators/NotificatorFirebase.java b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
index cd084080e..9d1982f9c 100644
--- a/src/main/java/org/traccar/notificators/NotificatorFirebase.java
+++ b/src/main/java/org/traccar/notificators/NotificatorFirebase.java
@@ -24,7 +24,9 @@ import org.traccar.config.Keys;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.model.User;
+import org.traccar.notification.FullMessage;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.ShortMessage;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.InvocationCallback;
@@ -68,9 +70,11 @@ public class NotificatorFirebase extends Notificator {
         final User user = Context.getPermissionsManager().getUser(userId);
         if (user.getAttributes().containsKey("notificationTokens")) {
 
+            ShortMessage shortMessage = NotificationFormatter.formatShortMessage(userId, event, position);
+
             Notification notification = new Notification();
-            notification.title=Context.getConfig().getString(Keys.NOTIFICATOR_FIREBASE_TITLE);
-            notification.body = NotificationFormatter.formatShortMessage(userId, event, position).trim();
+            notification.title= shortMessage.getTitle();
+            notification.body = shortMessage.getBody();
             notification.sound = "default";
 
             Message message = new Message();
diff --git a/src/main/java/org/traccar/notificators/NotificatorPushover.java b/src/main/java/org/traccar/notificators/NotificatorPushover.java
index 189af7834..e541ea525 100644
--- a/src/main/java/org/traccar/notificators/NotificatorPushover.java
+++ b/src/main/java/org/traccar/notificators/NotificatorPushover.java
@@ -24,6 +24,7 @@ import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.model.User;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.ShortMessage;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.InvocationCallback;
@@ -43,6 +44,8 @@ public class NotificatorPushover extends Notificator {
         private String user;
         @JsonProperty("device")
         private String device;
+        @JsonProperty("title")
+        private String title;
         @JsonProperty("message")
         private String message;
     }
@@ -74,11 +77,14 @@ public class NotificatorPushover extends Notificator {
             return;
         }
 
+        ShortMessage shortMessage = NotificationFormatter.formatShortMessage(userId, event, position);
+
         Message message = new Message();
         message.token = token;
         message.user = this.user;
         message.device = device;
-        message.message = NotificationFormatter.formatShortMessage(userId, event, position);
+        message.title= shortMessage.getTitle();
+        message.message = shortMessage.getBody();
 
         Context.getClient().target(url).request()
                 .async().post(Entity.json(message), new InvocationCallback<Object>() {
diff --git a/src/main/java/org/traccar/notificators/NotificatorSms.java b/src/main/java/org/traccar/notificators/NotificatorSms.java
index 8124e40b1..360eb44ff 100644
--- a/src/main/java/org/traccar/notificators/NotificatorSms.java
+++ b/src/main/java/org/traccar/notificators/NotificatorSms.java
@@ -24,6 +24,7 @@ import org.traccar.model.Position;
 import org.traccar.model.User;
 import org.traccar.notification.MessageException;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.ShortMessage;
 
 public final class NotificatorSms extends Notificator {
 
@@ -31,9 +32,10 @@ public final class NotificatorSms extends Notificator {
     public void sendAsync(long userId, Event event, Position position) {
         final User user = Context.getPermissionsManager().getUser(userId);
         if (user.getPhone() != null) {
+            ShortMessage shortMessage = NotificationFormatter.formatShortMessage(userId, event, position);
             Main.getInjector().getInstance(StatisticsManager.class).registerSms();
             Context.getSmsManager().sendMessageAsync(user.getPhone(),
-                    NotificationFormatter.formatShortMessage(userId, event, position), false);
+                    shortMessage.getBody(), false);
         }
     }
 
@@ -41,9 +43,10 @@ public final class NotificatorSms extends Notificator {
     public void sendSync(long userId, Event event, Position position) throws MessageException, InterruptedException {
         final User user = Context.getPermissionsManager().getUser(userId);
         if (user.getPhone() != null) {
+            ShortMessage shortMessage = NotificationFormatter.formatShortMessage(userId, event, position);
             Main.getInjector().getInstance(StatisticsManager.class).registerSms();
             Context.getSmsManager().sendMessageSync(user.getPhone(),
-                    NotificationFormatter.formatShortMessage(userId, event, position), false);
+                    shortMessage.getBody(), false);
         }
     }
 
diff --git a/src/main/java/org/traccar/notificators/NotificatorTelegram.java b/src/main/java/org/traccar/notificators/NotificatorTelegram.java
index dbba0d31d..a8cdacfbf 100644
--- a/src/main/java/org/traccar/notificators/NotificatorTelegram.java
+++ b/src/main/java/org/traccar/notificators/NotificatorTelegram.java
@@ -25,6 +25,7 @@ import org.traccar.config.Keys;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.ShortMessage;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.InvocationCallback;
@@ -98,12 +99,14 @@ public class NotificatorTelegram extends Notificator {
     @Override
     public void sendSync(long userId, Event event, Position position) {
         User user = Context.getPermissionsManager().getUser(userId);
+        ShortMessage shortMessage = NotificationFormatter.formatShortMessage(userId, event, position);
+
         TextMessage message = new TextMessage();
         message.chatId = user.getString("telegramChatId");
         if (message.chatId == null) {
             message.chatId = chatId;
         }
-        message.text = NotificationFormatter.formatShortMessage(userId, event, position);
+        message.text = shortMessage.getBody();
         executeRequest(urlSendText, message);
         if (sendLocation && position != null) {
             executeRequest(urlSendLocation, createLocationMessage(message.chatId, position));
diff --git a/templates/short/alarm.vm b/templates/short/alarm.vm
index ce641781b..faab92291 100644
--- a/templates/short/alarm.vm
+++ b/templates/short/alarm.vm
@@ -1 +1,2 @@
+#set($title = "Alarm")
 $device.name alarm: $position.getString("alarm") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/commandResult.vm b/templates/short/commandResult.vm
index 27fd668be..7b3986573 100644
--- a/templates/short/commandResult.vm
+++ b/templates/short/commandResult.vm
@@ -1 +1,2 @@
+#set($title = "Command Result")
 $device.name command result received: $position.getString("result") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceFuelDrop.vm b/templates/short/deviceFuelDrop.vm
index 5eabe9cc0..2a4d2c608 100644
--- a/templates/short/deviceFuelDrop.vm
+++ b/templates/short/deviceFuelDrop.vm
@@ -1 +1,2 @@
+#set($title = "Fuel Drop")
 $device.name fuel drop at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceInactive.vm b/templates/short/deviceInactive.vm
index d7431124c..f701ba408 100644
--- a/templates/short/deviceInactive.vm
+++ b/templates/short/deviceInactive.vm
@@ -1,3 +1,4 @@
+#set($title = "Inactive")
 #set($lastUpdate = $dateTool.getDate())
 #set($ignore = $lastUpdate.setTime($event.getLong("lastUpdate")))
 $device.name inactive from $dateTool.format("YYYY-MM-dd HH:mm:ss", $lastUpdate, $locale, $timezone)
diff --git a/templates/short/deviceMoving.vm b/templates/short/deviceMoving.vm
index a08becd2b..3307326d6 100644
--- a/templates/short/deviceMoving.vm
+++ b/templates/short/deviceMoving.vm
@@ -1 +1,2 @@
+#set($title = "Moving")
 $device.name moving at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOffline.vm b/templates/short/deviceOffline.vm
index 1dac43ac6..1967970b3 100644
--- a/templates/short/deviceOffline.vm
+++ b/templates/short/deviceOffline.vm
@@ -1 +1,2 @@
+#set($title = "Offline")
 $device.name offline at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOnline.vm b/templates/short/deviceOnline.vm
index 3c18097c1..65a59a8b3 100644
--- a/templates/short/deviceOnline.vm
+++ b/templates/short/deviceOnline.vm
@@ -1 +1,2 @@
+#set($title = "Online")
 $device.name online at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOverspeed.vm b/templates/short/deviceOverspeed.vm
index fe318fe08..fa4d7b189 100644
--- a/templates/short/deviceOverspeed.vm
+++ b/templates/short/deviceOverspeed.vm
@@ -7,4 +7,5 @@
 #else
 #set($speedString = $numberTool.format("0.0 kn", $position.speed))
 #end
+#set($title = "Overspeed")
 $device.name exceeds the speed $speedString#{if}($geofence) in $geofence.name#{else}#{end} at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceStopped.vm b/templates/short/deviceStopped.vm
index 1a63630ba..42147782b 100644
--- a/templates/short/deviceStopped.vm
+++ b/templates/short/deviceStopped.vm
@@ -1 +1,2 @@
+#set($title = "Stopped")
 $device.name stopped at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceUnknown.vm b/templates/short/deviceUnknown.vm
index 37baa30a7..b0fd2c42d 100644
--- a/templates/short/deviceUnknown.vm
+++ b/templates/short/deviceUnknown.vm
@@ -1 +1,2 @@
+#set($title = "Status unknown")
 $device.name status is unknown at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/driverChanged.vm b/templates/short/driverChanged.vm
index 36ed8955e..fc9a6689e 100644
--- a/templates/short/driverChanged.vm
+++ b/templates/short/driverChanged.vm
@@ -3,4 +3,5 @@
 #else
 #set($driverName = $event.getString("driverUniqueId"))
 #end
+#set($title = "Driver changed")
 Driver $driverName has changed in $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/geofenceEnter.vm b/templates/short/geofenceEnter.vm
index 962eecc53..79736b096 100644
--- a/templates/short/geofenceEnter.vm
+++ b/templates/short/geofenceEnter.vm
@@ -1 +1,2 @@
+#set($title = "Geofence entered")
 $device.name has entered geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/geofenceExit.vm b/templates/short/geofenceExit.vm
index 47999fa94..db5243600 100644
--- a/templates/short/geofenceExit.vm
+++ b/templates/short/geofenceExit.vm
@@ -1 +1,2 @@
+#set($title = "Geofence exited")
 $device.name has exited geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/ignitionOff.vm b/templates/short/ignitionOff.vm
index 4d4b45ccc..953e8d0a5 100644
--- a/templates/short/ignitionOff.vm
+++ b/templates/short/ignitionOff.vm
@@ -1 +1,2 @@
+#set($title = "Ignition OFF")
 $device.name ignition OFF at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/ignitionOn.vm b/templates/short/ignitionOn.vm
index d8dd07966..610b8e272 100644
--- a/templates/short/ignitionOn.vm
+++ b/templates/short/ignitionOn.vm
@@ -1 +1,2 @@
+#set($title = "Ignition ON")
 $device.name ignition ON at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/maintenance.vm b/templates/short/maintenance.vm
index a931e5c20..917345599 100644
--- a/templates/short/maintenance.vm
+++ b/templates/short/maintenance.vm
@@ -1 +1,2 @@
+#set($title = "Maintenance")
 $device.name maintenance $maintenance.name is required at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/test.vm b/templates/short/test.vm
index d25f218ce..bd317d97b 100644
--- a/templates/short/test.vm
+++ b/templates/short/test.vm
@@ -1 +1,2 @@
+#set($title = "Test")
 Test message
diff --git a/templates/short/textMessage.vm b/templates/short/textMessage.vm
index 59fa7cbc6..456dcacd3 100644
--- a/templates/short/textMessage.vm
+++ b/templates/short/textMessage.vm
@@ -1 +1,2 @@
+#set($title = "Text message")
 Text message received from $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/unknown.vm b/templates/short/unknown.vm
index fd20b50cc..a7259f6e9 100644
--- a/templates/short/unknown.vm
+++ b/templates/short/unknown.vm
@@ -1 +1,2 @@
+#set($title = "Unknown")
 Unknown type