- Removed any decoding from FrameDecoder

- Decoded ping packet in ProtocolDecoder
- Adapted tests

1 files changed, 1 insertions, 5 deletions

diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index c5309db71..ac1622350 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -15,9 +15,7 @@
  */
 package org.traccar.protocol;
 
-import java.nio.charset.StandardCharsets;
 import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
@@ -42,9 +40,7 @@ public class WondexFrameDecoder extends FrameDecoder {
             if (channel != null) {
                 channel.write(frame);
             }
-            // Pass deviceId to protocol decoder
-            long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL;
-            return ChannelBuffers.copiedBuffer("$ID:" + String.valueOf(deviceId), StandardCharsets.US_ASCII);
+            return frame;
 
         } else {