5 files changed, 62 insertions, 2 deletions
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
index 1b8d93e34..0070904ab 100644
--- a/src/org/traccar/Main.java
+++ b/src/org/traccar/Main.java
@@ -16,10 +16,13 @@
 package org.traccar;
 
 import org.traccar.helper.Log;
-
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.Locale;
 
 public final class Main {
+    static final long cleanDelay = 10*1000;           //10 sec
+    static final long cleanPeriod = 24*60*60*1000;    //24 hr
 
     private Main() {
     }
@@ -35,6 +38,19 @@ public final class Main {
             Context.getWebServer().start();
         }
 
+        Timer timer = new Timer();
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                // Clean positions history
+                try {
+                    Context.getDataManager().clearPositionsHistory();
+                } catch (Exception error) {
+                    Log.warning(error);
+                }
+            }
+        }, cleanDelay, cleanPeriod);
+
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index b3f24383f..a9fc09448 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -521,6 +521,33 @@ public class DataManager implements IdentityManager {
                 .executeQuery(Position.class);
     }
 
+    public void clearPositionsHistory() throws SQLException {
+        //SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+        int histDays = config.getInteger("database.positionsHistoryDays");
+        if (histDays == 0) {
+            return;
+        }
+
+        String sql = getQuery("database.clearPositionsHistory");
+        if (sql == null) {
+            return;
+        }
+
+        for (Device device : getAllDevices()) {
+            Date lastUpdate = device.getLastUpdate();
+            if(lastUpdate != null){
+
+                Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000 ); //Subtract histDays days
+                //String dt = s.format(dateBefore);
+
+                QueryBuilder.create(dataSource, sql)
+                        .setLong("deviceId", device.getId())
+                        .setDate("serverTime", dateBefore)
+                        .executeUpdate();
+            }
+        }
+    }
+
     public Server getServer() throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectServers"))
                 .executeQuerySingle(Server.class);
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 4e03b2097..c5a7889bd 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -28,6 +28,7 @@ public class Position extends Message {
     public static final String KEY_GPS = "gps";
     public static final String KEY_EVENT = "event";
     public static final String KEY_ALARM = "alarm";
+    public static final String KEY_ALARM_TYPE = "alarm-type";
     public static final String KEY_STATUS = "status";
     public static final String KEY_ODOMETER = "odometer";
     public static final String KEY_HOURS = "hours";
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index ec5d3adef..ffe16e975 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -64,8 +64,21 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
 
     private void processStatus(Position position, long status) {
         if (!BitUtil.check(status, 0) || !BitUtil.check(status, 1)
-                || !BitUtil.check(status, 3) || !BitUtil.check(status, 4)) {
+                || !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) {
             position.set(Position.KEY_ALARM, true);
+
+            if (!BitUtil.check(status, 0)){
+                position.set(Position.KEY_ALARM_TYPE, "theft");
+            } else if (!BitUtil.check(status, 1)){
+                position.set(Position.KEY_ALARM_TYPE, "robbery");
+            } else if (!BitUtil.check(status, 3)){
+                position.set(Position.KEY_ALARM_TYPE, "illegal ignition");
+            } else if (!BitUtil.check(status, 4)){
+                position.set(Position.KEY_ALARM_TYPE, "entering");
+            } else if (!BitUtil.check(status, 7)){
+                position.set(Position.KEY_ALARM_TYPE, "out");
+            }
+
         }
         position.set(Position.KEY_IGNITION, !BitUtil.check(status, 10));
         position.set(Position.KEY_STATUS, status);
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 5527e80f3..4ef31b1df 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -118,6 +118,9 @@ public class WebServer {
         resourceHandler.setResourceBase(config.getString("web.path"));
         if (config.getBoolean("web.debug")) {
             resourceHandler.setWelcomeFiles(new String[] {"debug.html"});
+            //Troubleshooting Locked UI Files on Windows while app is running (like html, js, css, etc...),
+            //you can make changes to the UI Files and refresh the page in the browser without stopping the app first
+            resourceHandler.setMinMemoryMappedContentLength(-1);
         } else {
             resourceHandler.setWelcomeFiles(new String[] {"release.html", "index.html"});
         }