Merge remote-tracking branch 'origin/master'

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/org/traccar/database/ActiveDevice.java b/src/main/java/org/traccar/database/ActiveDevice.java
index 207fc454b..e3ece6ad9 100644
--- a/src/main/java/org/traccar/database/ActiveDevice.java
+++ b/src/main/java/org/traccar/database/ActiveDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 package org.traccar.database;
 
 import io.netty.channel.Channel;
-import org.traccar.NetworkMessage;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import org.traccar.BasePipelineFactory;
 import org.traccar.Protocol;
 import org.traccar.model.Command;
 
@@ -44,12 +45,12 @@ public class ActiveDevice {
         return deviceId;
     }
 
-    public void sendCommand(Command command) {
-        protocol.sendDataCommand(this, command);
+    public boolean supportsLiveCommands() {
+        return BasePipelineFactory.getHandler(channel.pipeline(), HttpRequestDecoder.class) == null;
     }
 
-    public void write(Object message) {
-        channel.writeAndFlush(new NetworkMessage(message, remoteAddress));
+    public void sendCommand(Command command) {
+        protocol.sendDataCommand(channel, remoteAddress, command);
     }
 
 }