diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-03-22 17:16:04 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-03-22 17:16:04 +0500 |
| commit | ce809d8f053360bd820cf05175101b92a40b8109 (patch) | |
| tree | 6e28d993f24f4ee9dab7a3e06eb49cf7e3de7848 | |
| parent | b2584fc441a7dde87f97c66e23a7cabd9591fd13 (diff) | |
| download | trackermap-server-ce809d8f053360bd820cf05175101b92a40b8109.tar.gz trackermap-server-ce809d8f053360bd820cf05175101b92a40b8109.tar.bz2 trackermap-server-ce809d8f053360bd820cf05175101b92a40b8109.zip | |
Move device status initialization to model
| -rw-r--r-- | src/org/traccar/database/DeviceManager.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/model/Device.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index a6caf0e47..ae5784b01 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -202,7 +202,6 @@ public class DeviceManager implements IdentityManager { public void addDevice(Device device) throws SQLException { dataManager.addDevice(device); - device.setStatus(Device.STATUS_OFFLINE); devicesById.put(device.getId(), device); devicesByUniqueId.put(device.getUniqueId(), device); if (device.getPhone() != null && !device.getPhone().isEmpty()) { 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; |