Add verbose logging for decryption errors of incoming messages

[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 e59c7f86ade88784d8462b7ddf5edaceef02e7bd..003f6695bd1eddcd18a74e0fc763c22524c56312 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -14,7 +14,9 @@ import org.asamk.signal.manager.api.Message;
 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.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;


@@ -26,7 +28,7 @@ import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;

-import org.asamk.signal.util.ErrorUtils;
+import org.asamk.signal.util.SendMessageResultUtils;

 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;


@@ -191,9 +193,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendMessage(message, attachments, recipients);
+        return sendMessage(message, attachments, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -204,7 +204,7 @@ public class DbusSignalImpl implements Signal {
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
 
                             .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());


@@ -212,6 +212,8 @@ public class DbusSignalImpl implements Signal {
             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.");

         }
     }
 
         }
     }
 


@@ -219,9 +221,7 @@ public class DbusSignalImpl implements Signal {
     public long sendRemoteDeleteMessage(
             final long targetSentTimestamp, final String recipient
     ) {
     public long sendRemoteDeleteMessage(
             final long targetSentTimestamp, final String recipient
     ) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+        return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -233,23 +233,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());


@@ -266,9 +250,7 @@ public class DbusSignalImpl implements Signal {
             final long targetSentTimestamp,
             final String recipient
     ) {
             final long targetSentTimestamp,
             final String recipient
     ) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+        return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -287,12 +269,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.");

         }
     }
 
         }
     }
 


@@ -301,13 +285,11 @@ public class DbusSignalImpl implements Signal {
             final String recipient, final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final String recipient, final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {

-            var recipients = new ArrayList<String>(1);
-            recipients.add(recipient);

             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,

-                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                    getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
                             .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) {


@@ -322,7 +304,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());
         }


@@ -335,7 +317,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());
         }


@@ -366,7 +348,7 @@ public class DbusSignalImpl implements Signal {
         try {
             final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
                     Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
         try {
             final var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
                     Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));

-            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());


@@ -374,6 +356,8 @@ public class DbusSignalImpl implements Signal {
             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.");

         }
     }
 
         }
     }
 


@@ -381,7 +365,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());
         }


@@ -389,35 +373,60 @@ 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()));
+            var results = m.sendMessage(new Message(message, attachments, List.of(), Optional.empty()),
+                    Set.of(getGroupRecipientIdentifier(groupId)));
+            checkSendMessageResults(results);
+            return results.timestamp();

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

-            throw new Error.Failure("Recipient not found");
+            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());

         }
     }
 
         }
     }
 


@@ -434,13 +443,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.");

         }
     }
 
         }
     }
 


@@ -460,6 +471,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.");

         }
     }
 
         }
     }
 


@@ -469,6 +482,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.");

         }
     }
 
         }
     }
 


@@ -480,6 +495,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.");

         }
     }
 
         }
     }
 


@@ -499,11 +516,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
     @Override
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();

-        var ids = new ArrayList<byte[]>(groups.size());
-        for (var group : groups) {
-            ids.add(group.groupId().serialize());
-        }
-        return ids;
+        return groups.stream().map(g -> g.groupId().serialize()).toList();

     }
 
     @Override
     }
 
     @Override


@@ -559,7 +572,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),


@@ -569,7 +583,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;
             }


@@ -579,6 +593,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.");

         }
     }
 
         }
     }
 


@@ -595,9 +611,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<Boolean> isRegistered(List<String> numbers) {
 
     @Override
     public List<Boolean> isRegistered(List<String> numbers) {

-        var results = new ArrayList<Boolean>();

         if (numbers.isEmpty()) {
         if (numbers.isEmpty()) {

-            return results;
+            return List.of();

         }
 
         Map<String, Pair<String, UUID>> registered;
         }
 
         Map<String, Pair<String, UUID>> registered;


@@ -610,7 +625,7 @@ public class DbusSignalImpl implements Signal {
         return numbers.stream().map(number -> {
             var uuid = registered.get(number).second();
             return uuid != null;
         return numbers.stream().map(number -> {
             var uuid = registered.get(number).second();
             return uuid != null;

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     @Override
     }
 
     @Override


@@ -654,6 +669,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.");

         }
     }
 
         }
     }
 


@@ -663,6 +680,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.");

         }
     }
 
         }
     }
 


@@ -682,7 +701,7 @@ public class DbusSignalImpl implements Signal {
                 .map(a -> a.number().orElse(null))
                 .filter(Objects::nonNull)
                 .distinct()
                 .map(a -> a.number().orElse(null))
                 .filter(Objects::nonNull)
                 .distinct()

-                .collect(Collectors.toList());
+                .toList();

     }
 
     @Override
     }
 
     @Override


@@ -703,7 +722,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);


@@ -722,6 +741,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.");

         }
     }
 
         }
     }
 


@@ -781,13 +802,13 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {

-        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+        var error = SendMessageResultUtils.getErrorMessageFromSendMessageResult(result);

 
         if (error == null) {
             return;
         }
 
 
         if (error == null) {
             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);


@@ -796,31 +817,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 = ErrorUtils.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) {


@@ -828,23 +847,23 @@ public class DbusSignalImpl implements Signal {
             return;
         }
 
             return;
         }
 

-        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
-        if (errors.size() == 0) {
+        var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
+        if (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());
     }
 
     private static List<String> getRecipientStrings(final Set<RecipientAddress> members) {
 
         throw new Error.Failure(message.toString());
     }
 
     private static List<String> getRecipientStrings(final Set<RecipientAddress> members) {

-        return members.stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toList());
+        return members.stream().map(RecipientAddress::getLegacyIdentifier).toList();

     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(


@@ -867,6 +886,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);


@@ -1143,7 +1166,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


@@ -1246,6 +1281,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.");

             }
         }
     }
             }
         }
     }