Use improved shutdown for jsonRpc command

[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 df1d51bf02aba677a4d95d3828cdb9f98ed49a07..aee1330d0b0bb218405f4ca45978fea8fa42ee08 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -373,7 +373,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 connection.exportObject(signalControl);
 
                 c.addOnManagerAddedHandler(m -> {
                 connection.exportObject(signalControl);
 
                 c.addOnManagerAddedHandler(m -> {

-                    final var thread = exportMultiAccountManager(connection, m);
+                    final var thread = exportManager(connection, m);

                     try {
                         thread.join();
                     } catch (InterruptedException ignored) {
                     try {
                         thread.join();
                     } catch (InterruptedException ignored) {


@@ -390,10 +390,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                 });
 
                     }
                 });
 

-                final var initThreads = c.getManagers()
-                        .stream()
-                        .map(m -> exportMultiAccountManager(connection, m))
-                        .toList();
+                final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();

 
                 for (var t : initThreads) {
                     try {
 
                 for (var t : initThreads) {
                     try {


@@ -414,7 +411,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             }
         }
 
             }
         }
 

-        private Thread exportMultiAccountManager(
+        private Thread exportManager(

                 final DBusConnection conn, final Manager m
         ) {
             final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
                 final DBusConnection conn, final Manager m
         ) {
             final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());