Reexport dbus objects when self number changes

[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 34a80226cbbf7508d2740458a47ddb177529a0b1..79e0cd82965ab20f240afe14adf5385b5aae11a7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -155,7 +155,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
 
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
 

-        c.getAccountNumbers().stream().map(c::getManager).filter(Objects::nonNull).forEach(m -> {
+        c.getManagers().forEach(m -> {

             m.setIgnoreAttachments(ignoreAttachments);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
             m.setIgnoreAttachments(ignoreAttachments);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });


@@ -314,13 +314,10 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                 } catch (DBusException ignored) {
                 }
                     }
                 } catch (DBusException ignored) {
                 }

-                connection.unExportObject(path);

             });
 
             });
 

-            final var initThreads = c.getAccountNumbers()
+            final var initThreads = c.getManagers()

                     .stream()
                     .stream()

-                    .map(c::getManager)
-                    .filter(Objects::nonNull)

                     .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
                     .filter(Objects::nonNull)
                     .toList();
                     .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
                     .filter(Objects::nonNull)
                     .toList();


@@ -372,7 +369,6 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
     ) throws DBusException {
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
             final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
     ) throws DBusException {
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);

-        conn.exportObject(signal);

         final var initThread = new Thread(signal::initObjects);
         initThread.setName("dbus-init");
         initThread.start();
         final var initThread = new Thread(signal::initObjects);
         initThread.setName("dbus-init");
         initThread.start();