Simplify data commands

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/org/traccar/BaseProtocol.java b/src/main/java/org/traccar/BaseProtocol.java
index 6d459f7d4..bd3391822 100644
--- a/src/main/java/org/traccar/BaseProtocol.java
+++ b/src/main/java/org/traccar/BaseProtocol.java
@@ -15,12 +15,14 @@
  */
 package org.traccar;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
 import io.netty.handler.codec.string.StringEncoder;
-import org.traccar.database.ActiveDevice;
 import org.traccar.helper.DataConverter;
 import org.traccar.model.Command;
 
+import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -83,15 +85,16 @@ public abstract class BaseProtocol implements Protocol {
     }
 
     @Override
-    public void sendDataCommand(ActiveDevice activeDevice, Command command) {
+    public void sendDataCommand(Channel channel, SocketAddress remoteAddress, Command command) {
         if (supportedDataCommands.contains(command.getType())) {
-            activeDevice.write(command);
+            channel.writeAndFlush(new NetworkMessage(command, remoteAddress));
         } else if (command.getType().equals(Command.TYPE_CUSTOM)) {
             String data = command.getString(Command.KEY_DATA);
-            if (BasePipelineFactory.getHandler(activeDevice.getChannel().pipeline(), StringEncoder.class) != null) {
-                activeDevice.write(data);
+            if (BasePipelineFactory.getHandler(channel.pipeline(), StringEncoder.class) != null) {
+                channel.writeAndFlush(new NetworkMessage(data, remoteAddress));
             } else {
-                activeDevice.write(Unpooled.wrappedBuffer(DataConverter.parseHex(data)));
+                ByteBuf buf = Unpooled.wrappedBuffer(DataConverter.parseHex(data));
+                channel.writeAndFlush(new NetworkMessage(buf, remoteAddress));
             }
         } else {
             throw new RuntimeException("Command " + command.getType() + " is not supported in protocol " + getName());