Merge branch 'master' into develop

1 files changed, 0 insertions, 58 deletions

diff --git a/src/main/java/org/traccar/database/ActiveDevice.java b/src/main/java/org/traccar/database/ActiveDevice.java
deleted file mode 100644
index c05d56ad2..000000000
--- a/src/main/java/org/traccar/database/ActiveDevice.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.database;
-
-import io.netty.channel.Channel;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import org.traccar.BasePipelineFactory;
-import org.traccar.Protocol;
-import org.traccar.model.Command;
-
-import java.net.SocketAddress;
-
-public class ActiveDevice {
-
-    private final long deviceId;
-    private final Protocol protocol;
-    private final Channel channel;
-    private final SocketAddress remoteAddress;
-    private final boolean supportsLiveCommands;
-
-    public ActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
-        this.deviceId = deviceId;
-        this.protocol = protocol;
-        this.channel = channel;
-        this.remoteAddress = remoteAddress;
-        supportsLiveCommands = BasePipelineFactory.getHandler(channel.pipeline(), HttpRequestDecoder.class) == null;
-    }
-
-    public Channel getChannel() {
-        return channel;
-    }
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public boolean supportsLiveCommands() {
-        return supportsLiveCommands;
-    }
-
-    public void sendCommand(Command command) {
-        protocol.sendDataCommand(channel, remoteAddress, command);
-    }
-
-}