For #256 - detect whether device is offline not just by the device ti…

…me but by the server time as well
vitalidze · Sep 30, 2015 · 975b6c0 · 975b6c0
1 parent a37ce0d
commit 975b6c0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/traccar/web/server/model/EventServiceImpl.java b/src/main/java/org/traccar/web/server/model/EventServiceImpl.java
@@ -53,7 +53,8 @@ public void doWork() {
                 }
 
                 // check that device is offline
-                if (currentTime.getTime() - device.getLatestPosition().getTime().getTime() >= device.getTimeout() * 1000) {
+                if (currentTime.getTime() - device.getLatestPosition().getTime().getTime() >= device.getTimeout() * 1000
+                        && (device.getLatestPosition().getServerTime() == null || device.getLatestPosition().getServerTime().getTime() >= device.getTimeout() * 1000)) {
                     List<DeviceEvent> offlineEvents = entityManager.get().createQuery("SELECT e FROM DeviceEvent e WHERE e.position=:position AND e.type=:offline")
                             .setParameter("position", device.getLatestPosition())
                             .setParameter("offline", DeviceEventType.OFFLINE)