diff options
| author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
| commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
| tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /src/org/traccar/protocol/SigfoxProtocolDecoder.java | |
| parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
| parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
| download | trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/protocol/SigfoxProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/SigfoxProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/org/traccar/protocol/SigfoxProtocolDecoder.java index 65ab2cc55..b454e00fa 100644 --- a/src/org/traccar/protocol/SigfoxProtocolDecoder.java +++ b/src/org/traccar/protocol/SigfoxProtocolDecoder.java @@ -22,12 +22,12 @@ import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.helper.DataConverter; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; import javax.json.Json; import javax.json.JsonObject; -import javax.xml.bind.DatatypeConverter; import java.io.StringReader; import java.net.SocketAddress; import java.net.URLDecoder; @@ -61,7 +61,7 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder { position.setTime(new Date(json.getInt("time") * 1000L)); ChannelBuffer buf = ChannelBuffers.wrappedBuffer( - ByteOrder.LITTLE_ENDIAN, DatatypeConverter.parseHexBinary(json.getString("data"))); + ByteOrder.LITTLE_ENDIAN, DataConverter.parseHex(json.getString("data"))); int type = buf.readUnsignedByte() >> 4; if (type == 0) { |