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/model/Device.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/org/traccar/model') 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