Merge branch 'master' into command_framework

1 files changed, 4 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/AstraProtocolDecoder.java b/src/org/traccar/protocol/AstraProtocolDecoder.java
index 8cfec95fe..8f40abedf 100644
--- a/src/org/traccar/protocol/AstraProtocolDecoder.java
+++ b/src/org/traccar/protocol/AstraProtocolDecoder.java
@@ -26,7 +26,7 @@ import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -78,8 +78,9 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
             position.setCourse(buf.readUnsignedByte() * 2);
 
             int reason = buf.readUnsignedMedium();
-            buf.readUnsignedShort(); // status
+            position.set(Event.KEY_EVENT, reason);
 
+            position.set(Event.KEY_STATUS, buf.readUnsignedShort());
             position.set(Event.PREFIX_IO + 1, buf.readUnsignedByte());
             position.set(Event.PREFIX_ADC + 1, buf.readUnsignedByte());
             position.set(Event.KEY_BATTERY, buf.readUnsignedByte());
@@ -100,7 +101,7 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
 
             if (BitUtil.check(reason, 6) || BitUtil.check(reason, 7)) {
 
-                position.set(Event.KEY_RFID, buf.readBytes(7).toString(Charset.defaultCharset()));
+                position.set(Event.KEY_RFID, buf.readBytes(7).toString(StandardCharsets.US_ASCII));
                 position.set(Event.KEY_ODOMETER, buf.readUnsignedMedium());
 
                 buf.readUnsignedShort(); // engine time