Switch to hypfvieh dbus-java

[signal-cli] / src / main / java / org / asamk / signal / manager / Manager.java

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index cec0443142b988b22e8dc94f6d15dac37aeec714..ad770617910243e0c11924e03a52e7cb2bab3fd7 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.Signal;
 import org.asamk.signal.AttachmentInvalidException;
 
 import org.asamk.Signal;
 import org.asamk.signal.AttachmentInvalidException;

+import org.asamk.signal.DbusConfig;

 import org.asamk.signal.GroupNotFoundException;
 import org.asamk.signal.NotAGroupMemberException;
 import org.asamk.signal.StickerPackInvalidException;
 import org.asamk.signal.GroupNotFoundException;
 import org.asamk.signal.NotAGroupMemberException;
 import org.asamk.signal.StickerPackInvalidException;


@@ -732,7 +733,15 @@ public class Manager implements Signal {
         SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asEndSessionMessage();
 
         SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asEndSessionMessage();
 

-        sendMessageLegacy(messageBuilder, getSignalServiceAddresses(recipients));
+        final Collection<SignalServiceAddress> signalServiceAddresses = getSignalServiceAddresses(recipients);
+        try {
+            sendMessageLegacy(messageBuilder, signalServiceAddresses);
+        } catch (Exception e) {
+            for (SignalServiceAddress address : signalServiceAddresses) {
+                handleEndSession(address);
+            }
+            throw e;
+        }

     }
 
     @Override
     }
 
     @Override


@@ -1817,6 +1826,11 @@ public class Manager implements Signal {
         return false;
     }
 
         return false;
     }
 

+    @Override
+    public String getObjectPath() {
+        return null;
+    }
+

     private void sendGroups() throws IOException, UntrustedIdentityException {
         File groupsFile = IOUtils.createTempFile();
 
     private void sendGroups() throws IOException, UntrustedIdentityException {
         File groupsFile = IOUtils.createTempFile();