diff --git a/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java b/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java index dec20e609d..c00f6d4925 100644 --- a/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java +++ b/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java @@ -51,7 +51,7 @@ public class Elm327Connector implements Closeable { public Elm327Connector(IoStream underlyingStream) { this.underlyingStream = underlyingStream; underlyingStream.setInputListener(listener); - tsStream = new Elm327IoStream(this, "elm327Stream"); + tsStream = new Elm327IoStream(this); } /** diff --git a/java_console/io/src/main/java/com/rusefi/io/can/Elm327IoStream.java b/java_console/io/src/main/java/com/rusefi/io/can/Elm327IoStream.java index 54cf64934e..ba5d6b9021 100644 --- a/java_console/io/src/main/java/com/rusefi/io/can/Elm327IoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/can/Elm327IoStream.java @@ -15,7 +15,6 @@ import java.util.Arrays; */ public class Elm327IoStream extends AbstractIoStream { private final Elm327Connector con; - private final DisconnectListener disconnectListener; @NotNull private final IncomingDataBuffer dataBuffer; private DataListener dataListener; @@ -32,15 +31,9 @@ public class Elm327IoStream extends AbstractIoStream { private final IsoTpCanDecoder canDecoder = new IsoTpCanDecoder(); - - public Elm327IoStream(Elm327Connector con, String loggingPrefix) { - this(con, loggingPrefix, DisconnectListener.VOID); - } - - private Elm327IoStream(Elm327Connector con, String loggingPrefix, DisconnectListener disconnectListener) { + public Elm327IoStream(Elm327Connector con) { this.con = con; - this.disconnectListener = disconnectListener; - dataBuffer = createDataBuffer(loggingPrefix); + dataBuffer = createDataBuffer("elm327Stream"); // ByteBuffer inBuf = ByteBuffer.allocate(OUT_BUFFER_SIZE); outBuf = ByteBuffer.allocate(OUT_BUFFER_SIZE); @@ -52,7 +45,6 @@ public class Elm327IoStream extends AbstractIoStream { synchronized (this) { if (!isClosed()) { super.close(); - disconnectListener.onDisconnect("on close"); } } } @@ -127,11 +119,4 @@ public class Elm327IoStream extends AbstractIoStream { if (rawData.length != 0) sendDataToClient(rawData); } - - public interface DisconnectListener { - DisconnectListener VOID = (String message) -> { - - }; - void onDisconnect(String message); - } }