1 files changed, 7 insertions, 1 deletions
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index 12762c19b..e9c678930 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -74,7 +74,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
         this.protocol = protocol;
     }
 
-    public void getLastLocation(Position position) {
+    public void getLastLocation(Position position, Date deviceTime) {
         Position last = Context.getConnectionManager().getLastPosition(getDeviceId());
         if (last != null) {
             position.setFixTime(last.getFixTime());
@@ -87,6 +87,12 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
         } else {
             position.setFixTime(new Date(0));
         }
+
+        if (deviceTime != null) {
+            position.setDeviceTime(deviceTime);
+        } else {
+            position.setDeviceTime(new Date());
+        }
     }
 
 }