Add support for banning/unbanning group members

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusSignalImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 4a07e55e79a8c044836cd986d16571aaef9e1a35..850bcf1d824fb04830f07cb8b2de6a6960d7ea80 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -2,19 +2,22 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 
 import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;

-import org.asamk.signal.manager.AttachmentInvalidException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotMasterDeviceException;
-import org.asamk.signal.manager.StickerPackInvalidException;
+import org.asamk.signal.manager.api.AttachmentInvalidException;

 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidNumberException;

+import org.asamk.signal.manager.api.InvalidStickerException;

 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.Message;

+import org.asamk.signal.manager.api.NotMasterDeviceException;

 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;

+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.StickerPackInvalidException;

 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.TypingAction;

+import org.asamk.signal.manager.api.UnregisteredRecipientException;

 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;


@@ -76,12 +79,22 @@ public class DbusSignalImpl implements Signal {
         this.connection = connection;
         this.objectPath = objectPath;
         this.noReceiveOnStart = noReceiveOnStart;
         this.connection = connection;
         this.objectPath = objectPath;
         this.noReceiveOnStart = noReceiveOnStart;

+
+        m.addAddressChangedListener(() -> {
+            unExportObjects();
+            exportObjects();
+        });

     }
 
     public void initObjects() {
     }
 
     public void initObjects() {

+        exportObjects();

         if (!noReceiveOnStart) {
             subscribeReceive();
         }
         if (!noReceiveOnStart) {
             subscribeReceive();
         }

+    }
+
+    private void exportObjects() {
+        exportObject(this);

 
         updateDevices();
         updateGroups();
 
         updateDevices();
         updateGroups();


@@ -93,9 +106,14 @@ public class DbusSignalImpl implements Signal {
             m.removeReceiveHandler(dbusMessageHandler);
             dbusMessageHandler = null;
         }
             m.removeReceiveHandler(dbusMessageHandler);
             dbusMessageHandler = null;
         }

+        unExportObjects();
+    }
+
+    private void unExportObjects() {

         unExportDevices();
         unExportGroups();
         unExportConfiguration();
         unExportDevices();
         unExportGroups();
         unExportConfiguration();

+        connection.unExportObject(this.objectPath);

     }
 
     @Override
     }
 
     @Override


@@ -197,19 +215,25 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {

-            final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
+            final var results = m.sendMessage(new Message(message,
+                            attachments,
+                            List.of(),
+                            Optional.empty(),
+                            Optional.empty()),

                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
 
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
 

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());

-        } catch (IOException e) {
+        } catch (IOException | InvalidStickerException e) {

             throw new Error.Failure(e);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());
             throw new Error.Failure(e);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -229,23 +253,7 @@ public class DbusSignalImpl implements Signal {
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));

-            checkSendMessageResults(results.timestamp(), results.results());
-            return results.timestamp();
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
-            throw new Error.GroupNotFound(e.getMessage());
-        }
-    }
-
-    @Override
-    public long sendGroupRemoteDeleteMessage(
-            final long targetSentTimestamp, final byte[] groupId
-    ) {
-        try {
-            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
-                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());


@@ -281,12 +289,14 @@ public class DbusSignalImpl implements Signal {
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());
             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -299,7 +309,7 @@ public class DbusSignalImpl implements Signal {
                     getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
                     getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {


@@ -314,7 +324,7 @@ public class DbusSignalImpl implements Signal {
         try {
             final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
                     messageIds);
         try {
             final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
                     messageIds);

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }


@@ -327,7 +337,7 @@ public class DbusSignalImpl implements Signal {
         try {
             final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
                     messageIds);
         try {
             final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
                     messageIds);

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }


@@ -356,16 +366,21 @@ public class DbusSignalImpl implements Signal {
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {

-            final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
-                    Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
-            checkSendMessageResults(results.timestamp(), results.results());
+            final var results = m.sendMessage(new Message(message,
+                    attachments,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());

-        } catch (IOException e) {
+        } catch (IOException | InvalidStickerException e) {

             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -373,7 +388,7 @@ public class DbusSignalImpl implements Signal {
     public void sendEndSessionMessage(final List<String> recipients) {
         try {
             final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));
     public void sendEndSessionMessage(final List<String> recipients) {
         try {
             final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));

-            checkSendMessageResults(results.timestamp(), results.results());
+            checkSendMessageResults(results);

         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         }


@@ -381,35 +396,63 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void deleteRecipient(final String recipient) throws Error.Failure {
 
     @Override
     public void deleteRecipient(final String recipient) throws Error.Failure {

+        m.deleteRecipient(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+    }
+
+    @Override
+    public void deleteContact(final String recipient) throws Error.Failure {
+        m.deleteContact(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+    }
+
+    @Override
+    public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {

         try {
         try {

-            m.deleteRecipient(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
-        } catch (IOException e) {
-            throw new Error.Failure("Recipient not found");
+            var results = m.sendMessage(new Message(message,
+                    attachments,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
+            checkSendMessageResults(results);
+            return results.timestamp();
+        } catch (IOException | InvalidStickerException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        } catch (AttachmentInvalidException e) {
+            throw new Error.AttachmentInvalid(e.getMessage());
+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
     @Override
         }
     }
 
     @Override

-    public void deleteContact(final String recipient) throws Error.Failure {
+    public void sendGroupTyping(
+            final byte[] groupId, final boolean stop
+    ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {

         try {
         try {

-            m.deleteContact(getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+            final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
+                    Set.of(getGroupRecipientIdentifier(groupId)));
+            checkSendMessageResults(results);

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new Error.Failure("Contact not found");
+            throw new Error.Failure(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());

         }
     }
 
     @Override
         }
     }
 
     @Override

-    public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
+    public long sendGroupRemoteDeleteMessage(
+            final long targetSentTimestamp, final byte[] groupId
+    ) {

         try {
         try {

-            var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
-                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
-            checkSendMessageResults(results.timestamp(), results.results());
+            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
+                    Set.of(getGroupRecipientIdentifier(groupId)));
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());
             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());

-        } catch (AttachmentInvalidException e) {
-            throw new Error.AttachmentInvalid(e.getMessage());

         }
     }
 
         }
     }
 


@@ -426,13 +469,15 @@ public class DbusSignalImpl implements Signal {
                     remove,
                     getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetSentTimestamp,
                     remove,
                     getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetSentTimestamp,

-                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
-            checkSendMessageResults(results.timestamp(), results.results());
+                    Set.of(getGroupRecipientIdentifier(groupId)));
+            checkSendMessageResults(results);

             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());
             return results.timestamp();
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new Error.GroupNotFound(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -452,6 +497,8 @@ public class DbusSignalImpl implements Signal {
             throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new Error.Failure("Contact is not registered.");
             throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new Error.Failure("Contact is not registered.");

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -461,6 +508,8 @@ public class DbusSignalImpl implements Signal {
             m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getSelfNumber()), expiration);
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getSelfNumber()), expiration);
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -472,6 +521,8 @@ public class DbusSignalImpl implements Signal {
             throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -547,7 +598,8 @@ public class DbusSignalImpl implements Signal {
             final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
             if (groupId == null) {
                 final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
             final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
             if (groupId == null) {
                 final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));

-                checkSendMessageResults(results.second().timestamp(), results.second().results());
+                updateGroups();
+                checkGroupSendMessageResults(results.second().timestamp(), results.second().results());

                 return results.first().serialize();
             } else {
                 final var results = m.updateGroup(getGroupId(groupId),
                 return results.first().serialize();
             } else {
                 final var results = m.updateGroup(getGroupId(groupId),


@@ -557,7 +609,7 @@ public class DbusSignalImpl implements Signal {
                                 .withAvatarFile(avatar == null ? null : new File(avatar))
                                 .build());
                 if (results != null) {
                                 .withAvatarFile(avatar == null ? null : new File(avatar))
                                 .build());
                 if (results != null) {

-                    checkSendMessageResults(results.timestamp(), results.results());
+                    checkGroupSendMessageResults(results.timestamp(), results.results());

                 }
                 return groupId;
             }
                 }
                 return groupId;
             }


@@ -567,6 +619,8 @@ public class DbusSignalImpl implements Signal {
             throw new Error.GroupNotFound(e.getMessage());
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());
             throw new Error.GroupNotFound(e.getMessage());
         } catch (AttachmentInvalidException e) {
             throw new Error.AttachmentInvalid(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -641,6 +695,8 @@ public class DbusSignalImpl implements Signal {
             m.setRegistrationLockPin(Optional.empty());
         } catch (IOException e) {
             throw new Error.Failure("Remove pin error: " + e.getMessage());
             m.setRegistrationLockPin(Optional.empty());
         } catch (IOException e) {
             throw new Error.Failure("Remove pin error: " + e.getMessage());

+        } catch (NotMasterDeviceException e) {
+            throw new Error.Failure("This command doesn't work on linked devices.");

         }
     }
 
         }
     }
 


@@ -650,6 +706,8 @@ public class DbusSignalImpl implements Signal {
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (IOException e) {
             throw new Error.Failure("Set pin error: " + e.getMessage());
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (IOException e) {
             throw new Error.Failure("Set pin error: " + e.getMessage());

+        } catch (NotMasterDeviceException e) {
+            throw new Error.Failure("This command doesn't work on linked devices.");

         }
     }
 
         }
     }
 


@@ -690,7 +748,7 @@ public class DbusSignalImpl implements Signal {
                 Profile profile = null;
                 try {
                     profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));
                 Profile profile = null;
                 try {
                     profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));

-                } catch (IOException ignored) {
+                } catch (IOException | UnregisteredRecipientException ignored) {

                 }
                 if (profile != null && profile.getDisplayName().equals(name)) {
                     numbers.add(number);
                 }
                 if (profile != null && profile.getDisplayName().equals(name)) {
                     numbers.add(number);


@@ -709,6 +767,8 @@ public class DbusSignalImpl implements Signal {
             throw new Error.GroupNotFound(e.getMessage());
         } catch (IOException | LastGroupAdminException e) {
             throw new Error.Failure(e.getMessage());
             throw new Error.GroupNotFound(e.getMessage());
         } catch (IOException | LastGroupAdminException e) {
             throw new Error.Failure(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

         }
     }
 
         }
     }
 


@@ -774,7 +834,7 @@ public class DbusSignalImpl implements Signal {
             return;
         }
 
             return;
         }
 

-        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
+        final var message = "\nFailed to send message:\n" + error + '\n' + timestamp;

 
         if (result.isIdentityFailure()) {
             throw new Error.UntrustedIdentity(message);
 
         if (result.isIdentityFailure()) {
             throw new Error.UntrustedIdentity(message);


@@ -783,31 +843,29 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

-    private static void checkSendMessageResults(
-            long timestamp, Map<RecipientIdentifier, List<SendMessageResult>> results
-    ) throws DBusExecutionException {
-        final var sendMessageResults = results.values().stream().findFirst();
-        if (results.size() == 1 && sendMessageResults.get().size() == 1) {
-            checkSendMessageResult(timestamp, sendMessageResults.get().stream().findFirst().get());
+    private void checkSendMessageResults(final SendMessageResults results) {
+        final var sendMessageResults = results.results().values().stream().findFirst();
+        if (results.results().size() == 1 && sendMessageResults.get().size() == 1) {
+            checkSendMessageResult(results.timestamp(), sendMessageResults.get().stream().findFirst().get());

             return;
         }
 
             return;
         }
 

-        var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
-        if (errors.size() == 0) {
+        if (results.hasSuccess()) {

             return;
         }
 
         var message = new StringBuilder();
             return;
         }
 
         var message = new StringBuilder();

-        message.append(timestamp).append('\n');
-        message.append("Failed to send (some) messages:\n");
+        message.append("Failed to send messages:\n");
+        var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());

         for (var error : errors) {
             message.append(error).append('\n');
         }
         for (var error : errors) {
             message.append(error).append('\n');
         }

+        message.append(results.timestamp());

 
         throw new Error.Failure(message.toString());
     }
 
 
         throw new Error.Failure(message.toString());
     }
 

-    private static void checkSendMessageResults(
+    private static void checkGroupSendMessageResults(

             long timestamp, Collection<SendMessageResult> results
     ) throws DBusExecutionException {
         if (results.size() == 1) {
             long timestamp, Collection<SendMessageResult> results
     ) throws DBusExecutionException {
         if (results.size() == 1) {


@@ -816,16 +874,16 @@ public class DbusSignalImpl implements Signal {
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);

-        if (errors.size() == 0) {
+        if (errors.size() == 0 || errors.size() < results.size()) {

             return;
         }
 
         var message = new StringBuilder();
             return;
         }
 
         var message = new StringBuilder();

-        message.append(timestamp).append('\n');
-        message.append("Failed to send (some) messages:\n");
+        message.append("Failed to send message:\n");

         for (var error : errors) {
             message.append(error).append('\n');
         }
         for (var error : errors) {
             message.append(error).append('\n');
         }

+        message.append(timestamp);

 
         throw new Error.Failure(message.toString());
     }
 
         throw new Error.Failure(message.toString());
     }


@@ -854,6 +912,10 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

+    private RecipientIdentifier.Group getGroupRecipientIdentifier(final byte[] groupId) {
+        return new RecipientIdentifier.Group(getGroupId(groupId));
+    }
+

     private static GroupId getGroupId(byte[] groupId) throws DBusExecutionException {
         try {
             return GroupId.unknownVersion(groupId);
     private static GroupId getGroupId(byte[] groupId) throws DBusExecutionException {
         try {
             return GroupId.unknownVersion(groupId);


@@ -895,7 +957,7 @@ public class DbusSignalImpl implements Signal {
             if (d.isThisDevice()) {
                 thisDevice = new DBusPath(deviceObjectPath);
             }
             if (d.isThisDevice()) {
                 thisDevice = new DBusPath(deviceObjectPath);
             }

-            this.devices.add(new StructDevice(new DBusPath(deviceObjectPath), d.id(), emptyIfNull(d.name())));
+            this.devices.add(new StructDevice(new DBusPath(deviceObjectPath), (long) d.id(), emptyIfNull(d.name())));

         });
     }
 
         });
     }
 


@@ -1100,6 +1162,8 @@ public class DbusSignalImpl implements Signal {
                                     () -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
                             new DbusProperty<>("Admins",
                                     () -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),
                                     () -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
                             new DbusProperty<>("Admins",
                                     () -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),

+                            new DbusProperty<>("Banned",
+                                    () -> new Variant<>(getRecipientStrings(getGroup().bannedMembers()), "as")),

                             new DbusProperty<>("PermissionAddMember",
                                     () -> getGroup().permissionAddMember().name(),
                                     this::setGroupPermissionAddMember),
                             new DbusProperty<>("PermissionAddMember",
                                     () -> getGroup().permissionAddMember().name(),
                                     this::setGroupPermissionAddMember),


@@ -1130,7 +1194,19 @@ public class DbusSignalImpl implements Signal {
                 throw new Error.Failure(e.getMessage());
             } catch (LastGroupAdminException e) {
                 throw new Error.LastGroupAdmin(e.getMessage());
                 throw new Error.Failure(e.getMessage());
             } catch (LastGroupAdminException e) {
                 throw new Error.LastGroupAdmin(e.getMessage());

+            } catch (UnregisteredRecipientException e) {
+                throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
+            }
+        }
+
+        @Override
+        public void deleteGroup() throws Error.Failure, Error.LastGroupAdmin {
+            try {
+                m.deleteGroup(groupId);
+            } catch (IOException e) {
+                throw new Error.Failure(e.getMessage());

             }
             }

+            updateGroups();

         }
 
         @Override
         }
 
         @Override


@@ -1233,6 +1309,8 @@ public class DbusSignalImpl implements Signal {
                 throw new Error.GroupNotFound(e.getMessage());
             } catch (AttachmentInvalidException e) {
                 throw new Error.AttachmentInvalid(e.getMessage());
                 throw new Error.GroupNotFound(e.getMessage());
             } catch (AttachmentInvalidException e) {
                 throw new Error.AttachmentInvalid(e.getMessage());

+            } catch (UnregisteredRecipientException e) {
+                throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");

             }
         }
     }
             }
         }
     }