Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 3 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/org/traccar/protocol/SigfoxProtocolDecoder.java
index 7cf57681f..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;
@@ -55,14 +55,13 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        Position position = new Position(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
         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) {