From 592c226655d940600b746b974ca76dbfb5390fc5 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 15 Aug 2020 22:35:48 -0400 Subject: [PATCH] hiding things from Android --- .../com/rusefi/binaryprotocol/BinaryProtocol.java | 2 +- .../src/main/java/com/rusefi/io/CommandQueue.java | 9 ++++----- .../src/main/java/com/rusefi/io/LinkManager.java | 14 ++++++++++++-- .../java/com/rusefi/io/serial/StreamConnector.java | 2 +- .../java/com/rusefi/ts_plugin/UploadQueue.java | 1 - 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java index 5e70180458..eebbaba9eb 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -153,7 +153,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { communicationLoggingListener = new CommunicationLoggingListener() { @Override public void onPortHolderMessage(Class clazz, String message) { - MessagesCentral.getInstance().postMessage(clazz, message); + linkManager.messageListener.postMessage(clazz, message); } }; diff --git a/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java b/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java index 7654cf1e57..5aabd3f531 100644 --- a/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java +++ b/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java @@ -100,7 +100,7 @@ public class CommandQueue { } if (counter != 1) - MessagesCentral.getInstance().postMessage(CommandQueue.class, "Took " + counter + " attempts"); + linkManager.messageListener.postMessage(CommandQueue.class, "Took " + counter + " attempts"); } public CommandQueue(LinkManager linkManager) { @@ -109,7 +109,7 @@ public class CommandQueue { @SuppressWarnings("InfiniteLoopStatement") @Override public void run() { - MessagesCentral.getInstance().postMessage(COMMAND_QUEUE_CLASS, "SerialIO started"); + linkManager.messageListener.postMessage(COMMAND_QUEUE_CLASS, "SerialIO started"); while (true) { try { sendPendingCommand(); @@ -134,13 +134,12 @@ public class CommandQueue { * TODO: add example, todo: refactor method and add unit test */ public void handleConfirmationMessage(final String message) { - MessagesCentral mc = MessagesCentral.getInstance(); String confirmation = LinkManager.unpackConfirmation(message); if (confirmation == null) - mc.postMessage(CommandQueue.class, "Broken confirmation length: " + message); + linkManager.messageListener.postMessage(CommandQueue.class, "Broken confirmation length: " + message); pendingConfirmations.add(confirmation); if (LinkManager.LOG_LEVEL.isDebugEnabled()) - mc.postMessage(CommandQueue.class, "got valid conf! " + confirmation + ", still pending: " + pendingCommands.size()); + linkManager.messageListener.postMessage(CommandQueue.class, "got valid conf! " + confirmation + ", still pending: " + pendingCommands.size()); // FileLog.MAIN.logLine("templog got valid conf " + confirmation + " " + System.currentTimeMillis() + " " + new Date()); diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index 6c28d4d24e..a8b72dc352 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -48,6 +48,12 @@ public class LinkManager implements Closeable { private boolean isStarted; private boolean compositeLogicEnabled = true; private boolean needPullData = true; + public MessagesListener messageListener = new MessagesListener() { + @Override + public void postMessage(Class source, String message) { + System.out.println(source + ": " + message); + } + }; public LinkManager() { engineState = new EngineState(new EngineState.EngineStateListenerImpl() { @@ -206,7 +212,7 @@ public class LinkManager implements Closeable { Callable streamFactory = new Callable() { @Override public IoStream call() { - MessagesCentral.getInstance().postMessage(getClass(), "Opening port: " + port); + messageListener.postMessage(getClass(), "Opening port: " + port); Socket socket; try { int portPart = TcpConnector.getTcpPort(port); @@ -228,7 +234,7 @@ public class LinkManager implements Closeable { Callable ioStreamCallable = new Callable() { @Override public IoStream call() { - MessagesCentral.getInstance().postMessage(getClass(), "Opening port: " + port); + messageListener.postMessage(getClass(), "Opening port: " + port); IoStream stream = ((Callable) () -> SerialIoStreamJSerialComm.openPort(port)).call(); if (stream == null) { // error already reported @@ -296,4 +302,8 @@ public class LinkManager implements Closeable { System.out.println("All ports: " + Arrays.toString(ports)); return port; } + + public interface MessagesListener { + void postMessage(Class source, String message); + } } diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java index b535f73786..402107afd0 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java @@ -51,7 +51,7 @@ public class StreamConnector implements LinkConnector { @Override public void restart() { linkManager.execute(() -> { - MessagesCentral.getInstance().postMessage(StreamConnector.this.getClass(), "Restarting serial IO"); + linkManager.messageListener.postMessage(StreamConnector.this.getClass(), "Restarting serial IO"); portHolder.close(); portHolder.connectAndReadConfiguration(); }); diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java index fe5618a720..f0e81d75b2 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java @@ -2,7 +2,6 @@ package com.rusefi.ts_plugin; import com.devexperts.logging.Logging; import com.efiAnalytics.plugin.ecu.ControllerAccess; -import com.rusefi.auth.AutoTokenUtil; import com.rusefi.shared.FileUtil; import com.rusefi.tools.online.Online; import com.rusefi.tools.online.UploadResult;