Migrate more protocols

1 files changed, 9 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/AlematicsFrameDecoder.java b/src/org/traccar/protocol/AlematicsFrameDecoder.java
index b8b3e3403..daac868c0 100644
--- a/src/org/traccar/protocol/AlematicsFrameDecoder.java
+++ b/src/org/traccar/protocol/AlematicsFrameDecoder.java
@@ -15,10 +15,10 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LineBasedFrameDecoder;
+import org.traccar.NetworkMessage;
 
 public class AlematicsFrameDecoder extends LineBasedFrameDecoder {
 
@@ -31,20 +31,20 @@ public class AlematicsFrameDecoder extends LineBasedFrameDecoder {
     // example of heartbeat: FA F8 00 07 00 03 15 AD 4E 78 3A D2
 
     @Override
-    protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+    protected Object decode(ChannelHandlerContext ctx, ByteBuf buf) throws Exception {
 
         if (buf.readableBytes() < MESSAGE_MINIMUM_LENGTH) {
             return null;
         }
 
         if (buf.getUnsignedShort(buf.readerIndex()) == 0xFAF8) {
-            ChannelBuffer heartbeat = buf.readBytes(12);
-            if (channel != null) {
-                channel.write(heartbeat);
+            ByteBuf heartbeat = buf.readBytes(12);
+            if (ctx != null && ctx.channel() != null) {
+                ctx.channel().writeAndFlush(new NetworkMessage(heartbeat, ctx.channel().remoteAddress()));
             }
         }
 
-        return super.decode(ctx, channel, buf);
+        return super.decode(ctx, buf);
     }
 
 }