Use java.util.Optional in Manager interface

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 9627d9fb7ebb9d79a7191e4b0213f464ec1b377a..0b165774540546e1e5cf0427e6e44bf631b5bade 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -6,11 +6,12 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;
 
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;

-import org.asamk.signal.JsonDbusReceiveMessageHandler;
+import org.asamk.signal.JsonReceiveMessageHandler;

 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;

+import org.asamk.signal.ReceiveMessageHandler;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;


@@ -71,6 +72,9 @@ public class DaemonCommand implements MultiLocalCommand {
 
             try {
                 t.join();
 
             try {
                 t.join();

+                synchronized (this) {
+                    wait();
+                }

             } catch (InterruptedException ignored) {
             }
         } catch (DBusException | IOException e) {
             } catch (InterruptedException ignored) {
             }
         } catch (DBusException | IOException e) {


@@ -128,27 +132,13 @@ public class DaemonCommand implements MultiLocalCommand {
 
         logger.info("Exported dbus object: " + objectPath);
 
 
         logger.info("Exported dbus object: " + objectPath);
 

-        final var thread = new Thread(() -> {
-            while (!Thread.interrupted()) {
-                try {
-                    final var receiveMessageHandler = outputWriter instanceof JsonWriter
-                            ? new JsonDbusReceiveMessageHandler(m, (JsonWriter) outputWriter, conn, objectPath)
-                            : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);
-                    m.receiveMessages(receiveMessageHandler);
-                    break;
-                } catch (IOException e) {
-                    logger.warn("Receiving messages failed, retrying", e);
-                }
-            }
-            try {
-                initThread.join();
-            } catch (InterruptedException ignored) {
-            }
-            signal.close();
-        });
+        final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
+                (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
+        m.addReceiveHandler(handler);

 
 

-        thread.start();
+        final var dbusMessageHandler = new DbusReceiveMessageHandler(m, conn, objectPath);
+        m.addReceiveHandler(dbusMessageHandler);

 
 

-        return thread;
+        return initThread;

     }
 }
     }
 }