Cleanup and some adjustments

51 files changed, 115 insertions, 93 deletions

diff --git a/schema/changelog-3.18.xml b/schema/changelog-3.18.xml
deleted file mode 100644
index 85c3b0c33..000000000
--- a/schema/changelog-3.18.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
-  logicalFilePath="changelog-3.18">
-
-  <changeSet author="author" id="changelog-3.18">
-
-    <addColumn tableName="notifications">
-      <column name="transports" type="VARCHAR(128)" />
-    </addColumn>
-
-    <update tableName="notifications">
-        <column name="transports" value="web, mail, sms" />
-        <where>web = 1 AND mail = 1 AND sms = 1</where>
-    </update>
-    
-    <update tableName="notifications">
-        <column name="transports" value="web, mail" />
-        <where>web = 1 AND mail = 1 AND sms = 0</where>
-    </update>
-    
-    <update tableName="notifications">
-        <column name="transports" value="web" />
-        <where>web = 1 AND mail = 0 AND sms = 0</where>
-    </update>
-
-    <update tableName="notifications">
-        <column name="transports" value="web, sms" />
-        <where>web = 1 AND mail = 0 AND sms = 1</where>
-    </update>
-
-    <update tableName="notifications">
-        <column name="transports" value="mail, sms" />
-        <where>web = 0 AND mail = 1 AND sms = 1</where>
-    </update>
-
-    <update tableName="notifications">
-        <column name="transports" value="mail" />
-        <where>web = 0 AND mail = 1 AND sms = 0</where>
-    </update>
-
-    <update tableName="notifications">
-        <column name="transports" value="sms" />
-        <where>web = 0 AND mail = 0 AND sms = 1</where>
-    </update>
-    
-    <!-- 
-    <dropColumn tableName="notifications" columnName="web" />
-    <dropColumn tableName="notifications" columnName="mail" />
-    <dropColumn tableName="notifications" columnName="sms" />
-     -->
-
-  </changeSet>
-</databaseChangeLog>
diff --git a/schema/changelog-4.0.xml b/schema/changelog-4.0.xml
index 04e9fe0c4..82403c83c 100644
--- a/schema/changelog-4.0.xml
+++ b/schema/changelog-4.0.xml
@@ -53,4 +53,51 @@
 
   </changeSet>
 
+  <changeSet author="author" id="changelog-4.0">
+
+    <addColumn tableName="tc_notifications">
+      <column name="transports" type="VARCHAR(128)" />
+    </addColumn>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="web,mail,sms" />
+        <where>web = 1 AND mail = 1 AND sms = 1</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="web,mail" />
+        <where>web = 1 AND mail = 1 AND sms = 0</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="web" />
+        <where>web = 1 AND mail = 0 AND sms = 0</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="web,sms" />
+        <where>web = 1 AND mail = 0 AND sms = 1</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="mail,sms" />
+        <where>web = 0 AND mail = 1 AND sms = 1</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="mail" />
+        <where>web = 0 AND mail = 1 AND sms = 0</where>
+    </update>
+
+    <update tableName="tc_notifications">
+        <column name="transports" value="sms" />
+        <where>web = 0 AND mail = 0 AND sms = 1</where>
+    </update>
+
+    <dropColumn tableName="tc_notifications" columnName="web" />
+    <dropColumn tableName="tc_notifications" columnName="mail" />
+    <dropColumn tableName="tc_notifications" columnName="sms" />
+
+  </changeSet>
+
 </databaseChangeLog>
diff --git a/setup/default.xml b/setup/default.xml
index 353ba36a7..d7c1e5f0f 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -30,8 +30,8 @@
 
     <entry key='notificator.types'>web,mail</entry>
     <entry key='notificator.web.class'>org.traccar.notification.NotificationWeb</entry>
-    <entry key='notificator.sms.class'>org.traccar.notification.NotificationSms</entry>
     <entry key='notificator.mail.class'>org.traccar.notification.NotificationMail</entry>
+    <entry key='notificator.sms.class'>org.traccar.notification.NotificationSms</entry>
 
     <entry key='server.statistics'>https://www.traccar.org/analytics/</entry>
 
diff --git a/src/org/traccar/api/resource/NotificationResource.java b/src/org/traccar/api/resource/NotificationResource.java
index 2347b43fa..9046569a0 100644
--- a/src/org/traccar/api/resource/NotificationResource.java
+++ b/src/org/traccar/api/resource/NotificationResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,8 +52,9 @@ public class NotificationResource extends ExtendedObjectResource<Notification> {
     @POST
     @Path("test")
     public Response testMessage() throws NotificationException, InterruptedException {
-        for (String method : Context.getNotificatorManager().getNotificatorTypes()) {
-            Context.getNotificatorManager().getNotificator(method).sendSync(getUserId(), new Event("test", 0), null);
+        for (Typed method : Context.getNotificatorManager().getNotificatorTypes()) {
+            Context.getNotificatorManager()
+                    .getNotificator(method.getType()).sendSync(getUserId(), new Event("test", 0), null);
         }
         return Response.noContent().build();
     }
@@ -68,7 +69,7 @@ public class NotificationResource extends ExtendedObjectResource<Notification> {
 
     @GET
     @Path("notificators")
-    public Collection<String> getNotificators() {
+    public Collection<Typed> getNotificators() {
         return Context.getNotificatorManager().getNotificatorTypes();
     }
 
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 2c1ffc09c..b2a30e4f1 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -90,8 +90,9 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
                         notificationMethods.addAll(notification.getTransportMethods());
                     }
                 }
-                for (String nm : notificationMethods) {
-                    Context.getNotificatorManager().getNotificator(nm).sendAsync(userId, event, position);
+                for (String notificationMethod : notificationMethods) {
+                    Context.getNotificatorManager()
+                            .getNotificator(notificationMethod).sendAsync(userId, event, position);
                 }
             }
         }
diff --git a/src/org/traccar/model/Notification.java b/src/org/traccar/model/Notification.java
index 0b632c861..4923798c2 100644
--- a/src/org/traccar/model/Notification.java
+++ b/src/org/traccar/model/Notification.java
@@ -18,6 +18,10 @@ package org.traccar.model;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.traccar.database.QueryIgnore;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class Notification extends ScheduledModel {
 
     private boolean always;
@@ -52,13 +56,17 @@ public class Notification extends ScheduledModel {
     }
 
 
+    @JsonIgnore
+    @QueryIgnore
     public Set<String> getTransportMethods() {
-        final Set<String> set = new HashSet<>();
-        final String[] tmp = transports.split(",");
-        for (String t : tmp) {
-            set.add(t.trim());
+        final Set<String> result = new HashSet<>();
+        if (transports != null) {
+            final String[] transportsList = transports.split(",");
+            for (String transport : transportsList) {
+                result.add(transport.trim());
+            }
         }
-        return set;
+        return result;
     }
 
 }
diff --git a/src/org/traccar/notification/NotificationException.java b/src/org/traccar/notification/NotificationException.java
index 34d5a80f7..525e5ee37 100644
--- a/src/org/traccar/notification/NotificationException.java
+++ b/src/org/traccar/notification/NotificationException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index fb89bf5bd..76387c73b 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 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.
diff --git a/src/org/traccar/notification/NotificationNull.java b/src/org/traccar/notification/NotificationNull.java
index fd7950a80..3ee954c24 100644
--- a/src/org/traccar/notification/NotificationNull.java
+++ b/src/org/traccar/notification/NotificationNull.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
diff --git a/src/org/traccar/notification/NotificationSms.java b/src/org/traccar/notification/NotificationSms.java
index 63fd57895..dd3304d85 100644
--- a/src/org/traccar/notification/NotificationSms.java
+++ b/src/org/traccar/notification/NotificationSms.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 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.
diff --git a/src/org/traccar/notification/NotificationWeb.java b/src/org/traccar/notification/NotificationWeb.java
index c6a1ae281..8e04fc2c4 100644
--- a/src/org/traccar/notification/NotificationWeb.java
+++ b/src/org/traccar/notification/NotificationWeb.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
diff --git a/src/org/traccar/notification/Notificator.java b/src/org/traccar/notification/Notificator.java
index 7192d25c0..09f98d3ad 100644
--- a/src/org/traccar/notification/Notificator.java
+++ b/src/org/traccar/notification/Notificator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
diff --git a/src/org/traccar/notification/NotificatorManager.java b/src/org/traccar/notification/NotificatorManager.java
index 20c7749d2..87a294345 100644
--- a/src/org/traccar/notification/NotificatorManager.java
+++ b/src/org/traccar/notification/NotificatorManager.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
@@ -19,11 +19,13 @@ package org.traccar.notification;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import org.traccar.Context;
 import org.traccar.helper.Log;
+import org.traccar.model.Typed;
 
 public final class NotificatorManager {
 
@@ -33,13 +35,13 @@ public final class NotificatorManager {
             final String className = Context.getConfig().getString("notificator." + type + ".class", "");
             if (className.length() > 0) {
                 try {
-                    final Class<Notificator> c = (Class<Notificator>) Class.forName(className);
+                    final Class<Notificator> clazz = (Class<Notificator>) Class.forName(className);
                     try {
-                        final Constructor<Notificator> constructor = c.getConstructor(new Class[]{String.class});
+                        final Constructor<Notificator> constructor = clazz.getConstructor(new Class[]{String.class});
                         notificators.put(type, constructor.newInstance(type));
                     } catch (NoSuchMethodException e) {
                         // No constructor with String argument
-                        notificators.put(type, c.newInstance());
+                        notificators.put(type, clazz.newInstance());
                     }
                 } catch (ClassNotFoundException | InstantiationException
                         | IllegalAccessException | InvocationTargetException e) {
@@ -53,17 +55,21 @@ public final class NotificatorManager {
     private static final Notificator NULL_NOTIFICATOR = new NotificationNull();
 
     public Notificator getNotificator(String type) {
-        final Notificator n = notificators.get(type);
-        if (n == null) {
+        final Notificator notificator = notificators.get(type);
+        if (notificator == null) {
             Log.error("No notificator configured for type : " + type);
             return NULL_NOTIFICATOR;
         }
-        return n;
+        return notificator;
     }
 
 
-    public Set<String> getNotificatorTypes() {
-        return notificators.keySet();
+    public Set<Typed> getNotificatorTypes() {
+        Set<Typed> result = new HashSet<>();
+        for (String notificator : notificators.keySet()) {
+            result.add(new Typed(notificator));
+        }
+        return result;
     }
 
 
diff --git a/src/org/traccar/sms/SMSException.java b/src/org/traccar/sms/SMSException.java
index c9c0b3128..22ca95296 100644
--- a/src/org/traccar/sms/SMSException.java
+++ b/src/org/traccar/sms/SMSException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.
diff --git a/src/org/traccar/sms/SMSManager.java b/src/org/traccar/sms/SMSManager.java
index b40dae867..c4cb68fb7 100644
--- a/src/org/traccar/sms/SMSManager.java
+++ b/src/org/traccar/sms/SMSManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 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.sms;
 
 public interface SMSManager {
diff --git a/templates/mail/alarm.vm b/templates/full/alarm.vm
index 8f1164291..8f1164291 100644
--- a/templates/mail/alarm.vm
+++ b/templates/full/alarm.vm
diff --git a/templates/mail/commandResult.vm b/templates/full/commandResult.vm
index 5b6d8ef3e..5b6d8ef3e 100644
--- a/templates/mail/commandResult.vm
+++ b/templates/full/commandResult.vm
diff --git a/templates/mail/deviceFuelDrop.vm b/templates/full/deviceFuelDrop.vm
index c30ec3a1c..c30ec3a1c 100644
--- a/templates/mail/deviceFuelDrop.vm
+++ b/templates/full/deviceFuelDrop.vm
diff --git a/templates/mail/deviceMoving.vm b/templates/full/deviceMoving.vm
index 6e98af1de..6e98af1de 100644
--- a/templates/mail/deviceMoving.vm
+++ b/templates/full/deviceMoving.vm
diff --git a/templates/mail/deviceOffline.vm b/templates/full/deviceOffline.vm
index 1f6d02fb2..1f6d02fb2 100644
--- a/templates/mail/deviceOffline.vm
+++ b/templates/full/deviceOffline.vm
diff --git a/templates/mail/deviceOnline.vm b/templates/full/deviceOnline.vm
index 9211eff11..9211eff11 100644
--- a/templates/mail/deviceOnline.vm
+++ b/templates/full/deviceOnline.vm
diff --git a/templates/mail/deviceOverspeed.vm b/templates/full/deviceOverspeed.vm
index e5e576f3a..e5e576f3a 100644
--- a/templates/mail/deviceOverspeed.vm
+++ b/templates/full/deviceOverspeed.vm
diff --git a/templates/mail/deviceStopped.vm b/templates/full/deviceStopped.vm
index 2ec0f8db9..2ec0f8db9 100644
--- a/templates/mail/deviceStopped.vm
+++ b/templates/full/deviceStopped.vm
diff --git a/templates/mail/deviceUnknown.vm b/templates/full/deviceUnknown.vm
index 34fa01a8a..34fa01a8a 100644
--- a/templates/mail/deviceUnknown.vm
+++ b/templates/full/deviceUnknown.vm
diff --git a/templates/mail/driverChanged.vm b/templates/full/driverChanged.vm
index ba1e68661..ba1e68661 100644
--- a/templates/mail/driverChanged.vm
+++ b/templates/full/driverChanged.vm
diff --git a/templates/mail/geofenceEnter.vm b/templates/full/geofenceEnter.vm
index e83a0de62..e83a0de62 100644
--- a/templates/mail/geofenceEnter.vm
+++ b/templates/full/geofenceEnter.vm
diff --git a/templates/mail/geofenceExit.vm b/templates/full/geofenceExit.vm
index 3557f6eb2..3557f6eb2 100644
--- a/templates/mail/geofenceExit.vm
+++ b/templates/full/geofenceExit.vm
diff --git a/templates/mail/ignitionOff.vm b/templates/full/ignitionOff.vm
index 0281eef02..0281eef02 100644
--- a/templates/mail/ignitionOff.vm
+++ b/templates/full/ignitionOff.vm
diff --git a/templates/mail/ignitionOn.vm b/templates/full/ignitionOn.vm
index 27135a7f0..27135a7f0 100644
--- a/templates/mail/ignitionOn.vm
+++ b/templates/full/ignitionOn.vm
diff --git a/templates/mail/maintenance.vm b/templates/full/maintenance.vm
index c6973f97a..c6973f97a 100644
--- a/templates/mail/maintenance.vm
+++ b/templates/full/maintenance.vm
diff --git a/templates/mail/test.vm b/templates/full/test.vm
index 93cbdc549..93cbdc549 100644
--- a/templates/mail/test.vm
+++ b/templates/full/test.vm
diff --git a/templates/mail/textMessage.vm b/templates/full/textMessage.vm
index 174173c85..174173c85 100644
--- a/templates/mail/textMessage.vm
+++ b/templates/full/textMessage.vm
diff --git a/templates/mail/unknown.vm b/templates/full/unknown.vm
index 566ce0d42..566ce0d42 100644
--- a/templates/mail/unknown.vm
+++ b/templates/full/unknown.vm
diff --git a/templates/sms/alarm.vm b/templates/short/alarm.vm
index 389341cf1..389341cf1 100644
--- a/templates/sms/alarm.vm
+++ b/templates/short/alarm.vm
diff --git a/templates/sms/commandResult.vm b/templates/short/commandResult.vm
index 4a327d850..4a327d850 100644
--- a/templates/sms/commandResult.vm
+++ b/templates/short/commandResult.vm
diff --git a/templates/sms/deviceFuelDrop.vm b/templates/short/deviceFuelDrop.vm
index 5e51396d4..5e51396d4 100644
--- a/templates/sms/deviceFuelDrop.vm
+++ b/templates/short/deviceFuelDrop.vm
diff --git a/templates/sms/deviceMoving.vm b/templates/short/deviceMoving.vm
index aaa72ab0d..aaa72ab0d 100644
--- a/templates/sms/deviceMoving.vm
+++ b/templates/short/deviceMoving.vm
diff --git a/templates/sms/deviceOffline.vm b/templates/short/deviceOffline.vm
index 8c4a02335..8c4a02335 100644
--- a/templates/sms/deviceOffline.vm
+++ b/templates/short/deviceOffline.vm
diff --git a/templates/sms/deviceOnline.vm b/templates/short/deviceOnline.vm
index 62854feb0..62854feb0 100644
--- a/templates/sms/deviceOnline.vm
+++ b/templates/short/deviceOnline.vm
diff --git a/templates/sms/deviceOverspeed.vm b/templates/short/deviceOverspeed.vm
index 5e92f662c..5e92f662c 100644
--- a/templates/sms/deviceOverspeed.vm
+++ b/templates/short/deviceOverspeed.vm
diff --git a/templates/sms/deviceStopped.vm b/templates/short/deviceStopped.vm
index c2437b5f6..c2437b5f6 100644
--- a/templates/sms/deviceStopped.vm
+++ b/templates/short/deviceStopped.vm
diff --git a/templates/sms/deviceUnknown.vm b/templates/short/deviceUnknown.vm
index 07f39f3a9..07f39f3a9 100644
--- a/templates/sms/deviceUnknown.vm
+++ b/templates/short/deviceUnknown.vm
diff --git a/templates/sms/driverChanged.vm b/templates/short/driverChanged.vm
index 50849df7c..50849df7c 100644
--- a/templates/sms/driverChanged.vm
+++ b/templates/short/driverChanged.vm
diff --git a/templates/sms/geofenceEnter.vm b/templates/short/geofenceEnter.vm
index debdbf356..debdbf356 100644
--- a/templates/sms/geofenceEnter.vm
+++ b/templates/short/geofenceEnter.vm
diff --git a/templates/sms/geofenceExit.vm b/templates/short/geofenceExit.vm
index 8553458f7..8553458f7 100644
--- a/templates/sms/geofenceExit.vm
+++ b/templates/short/geofenceExit.vm
diff --git a/templates/sms/ignitionOff.vm b/templates/short/ignitionOff.vm
index ddf860413..ddf860413 100644
--- a/templates/sms/ignitionOff.vm
+++ b/templates/short/ignitionOff.vm
diff --git a/templates/sms/ignitionOn.vm b/templates/short/ignitionOn.vm
index 00b365be9..00b365be9 100644
--- a/templates/sms/ignitionOn.vm
+++ b/templates/short/ignitionOn.vm
diff --git a/templates/sms/maintenance.vm b/templates/short/maintenance.vm
index 621beae46..621beae46 100644
--- a/templates/sms/maintenance.vm
+++ b/templates/short/maintenance.vm
diff --git a/templates/sms/test.vm b/templates/short/test.vm
index d25f218ce..d25f218ce 100644
--- a/templates/sms/test.vm
+++ b/templates/short/test.vm
diff --git a/templates/sms/textMessage.vm b/templates/short/textMessage.vm
index dc42f29f1..dc42f29f1 100644
--- a/templates/sms/textMessage.vm
+++ b/templates/short/textMessage.vm
diff --git a/templates/sms/unknown.vm b/templates/short/unknown.vm
index fd20b50cc..fd20b50cc 100644
--- a/templates/sms/unknown.vm
+++ b/templates/short/unknown.vm