From ce809d8f053360bd820cf05175101b92a40b8109 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 22 Mar 2017 17:16:04 +0500 Subject: Move device status initialization to model --- src/org/traccar/model/Device.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/model') diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java index 22426c4db..4c02481ca 100644 --- a/src/org/traccar/model/Device.java +++ b/src/org/traccar/model/Device.java @@ -51,7 +51,11 @@ public class Device extends Extensible { } public void setStatus(String status) { - this.status = status; + if (STATUS_ONLINE.equals(status) || STATUS_UNKNOWN.equals(status)) { + this.status = status; + } else { + this.status = STATUS_OFFLINE; + } } private Date lastUpdate; -- cgit v1.2.3 From ff9f34d6e685119c5d85d705d6cbd4f29149eee0 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 23 Mar 2017 10:21:25 +0500 Subject: Move default device status to getter --- src/org/traccar/database/DeviceManager.java | 1 - src/org/traccar/model/Device.java | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/org/traccar/model') diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index ae5784b01..68e2e8262 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -131,7 +131,6 @@ public class DeviceManager implements IdentityManager { device.setGeofenceIds(geofenceManager.getCurrentDeviceGeofences(lastPosition)); } } - device.setStatus(Device.STATUS_OFFLINE); } } for (Iterator iterator = devicesById.keySet().iterator(); iterator.hasNext();) { diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java index 4c02481ca..2324da532 100644 --- a/src/org/traccar/model/Device.java +++ b/src/org/traccar/model/Device.java @@ -47,15 +47,11 @@ public class Device extends Extensible { private String status; public String getStatus() { - return status; + return status != null ? status : STATUS_OFFLINE; } public void setStatus(String status) { - if (STATUS_ONLINE.equals(status) || STATUS_UNKNOWN.equals(status)) { - this.status = status; - } else { - this.status = STATUS_OFFLINE; - } + this.status = status; } private Date lastUpdate; -- cgit v1.2.3