3 files changed, 20 insertions, 10 deletions
diff --git a/src/main/java/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java
index 099fb152d..99930d1e6 100644
--- a/src/main/java/org/traccar/model/Command.java
+++ b/src/main/java/org/traccar/model/Command.java
@@ -36,6 +36,7 @@ public class Command extends Message implements Cloneable {
     public static final String TYPE_REQUEST_PHOTO = "requestPhoto";
     public static final String TYPE_POWER_OFF = "powerOff";
     public static final String TYPE_REBOOT_DEVICE = "rebootDevice";
+    public static final String TYPE_FACTORY_RESET = "factoryReset";
     public static final String TYPE_SEND_SMS = "sendSms";
     public static final String TYPE_SEND_USSD = "sendUssd";
     public static final String TYPE_SOS_NUMBER = "sosNumber";
@@ -54,6 +55,7 @@ public class Command extends Message implements Cloneable {
     public static final String TYPE_SET_ODOMETER = "setOdometer";
     public static final String TYPE_GET_MODEM_STATUS = "getModemStatus";
     public static final String TYPE_GET_DEVICE_STATUS = "getDeviceStatus";
+    public static final String TYPE_SET_SPEED_LIMIT = "setSpeedLimit";
 
     public static final String TYPE_MODE_POWER_SAVING = "modePowerSaving";
     public static final String TYPE_MODE_DEEP_SLEEP = "modeDeepSleep";
diff --git a/src/main/java/org/traccar/model/Event.java b/src/main/java/org/traccar/model/Event.java
index 5eee2a0a0..a7a134ecf 100644
--- a/src/main/java/org/traccar/model/Event.java
+++ b/src/main/java/org/traccar/model/Event.java
@@ -19,15 +19,17 @@ import java.util.Date;
 
 public class Event extends Message {
 
-    public Event(String type, long deviceId, long positionId) {
-        this(type, deviceId);
-        setPositionId(positionId);
+    public Event(String type, Position position) {
+        setType(type);
+        setPositionId(position.getId());
+        setDeviceId(position.getDeviceId());
+        eventTime = position.getDeviceTime();
     }
 
     public Event(String type, long deviceId) {
         setType(type);
         setDeviceId(deviceId);
-        this.serverTime = new Date();
+        eventTime = new Date();
     }
 
     public Event() {
@@ -62,14 +64,14 @@ public class Event extends Message {
 
     public static final String TYPE_DRIVER_CHANGED = "driverChanged";
 
-    private Date serverTime;
+    private Date eventTime;
 
-    public Date getServerTime() {
-        return serverTime;
+    public Date getEventTime() {
+        return eventTime;
     }
 
-    public void setServerTime(Date serverTime) {
-        this.serverTime = serverTime;
+    public void setEventTime(Date eventTime) {
+        this.eventTime = eventTime;
     }
 
     private long positionId;
diff --git a/src/main/java/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java
index e84943efc..7bdb53b22 100644
--- a/src/main/java/org/traccar/model/Server.java
+++ b/src/main/java/org/traccar/model/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2021 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.traccar.Context;
 import org.traccar.database.QueryIgnore;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -176,4 +177,9 @@ public class Server extends ExtendedModel {
         return getClass().getPackage().getImplementationVersion();
     }
 
+    @QueryIgnore
+    public Boolean getEmailEnabled() {
+        return Context.getMailManager().getEmailEnabled();
+    }
+
 }