Refactor dbus client mode to improve maintainability

[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 6606e966a14ac78fc8476cdfde29f0d421cf07ba..1a4fdc10240fb9394aa1f5c15582cd5fc9cb74ba 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -5,34 +5,55 @@ import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;

+import org.asamk.signal.manager.StickerPackInvalidException;
+import org.asamk.signal.manager.UntrustedIdentityException;
+import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TypingAction;

 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupNotFoundException;

+import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.groups.LastGroupAdminException;

 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

-import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;

 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

+import org.whispersystems.libsignal.InvalidKeyException;

 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;

+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

+import java.net.URI;
+import java.net.URISyntaxException;

 import java.util.ArrayList;
 import java.util.ArrayList;

+import java.util.Collection;
+import java.util.HashSet;

 import java.util.List;
 import java.util.List;

+import java.util.Map;

 import java.util.Objects;
 import java.util.Objects;

+import java.util.Set;
+import java.util.UUID;

 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class DbusSignalImpl implements Signal {
 
     private final Manager m;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class DbusSignalImpl implements Signal {
 
     private final Manager m;

+    private final String objectPath;

 
 

-    public DbusSignalImpl(final Manager m) {
+    public DbusSignalImpl(final Manager m, final String objectPath) {

         this.m = m;
         this.m = m;

+        this.objectPath = objectPath;

     }
 
     @Override
     }
 
     @Override


@@ -42,67 +63,80 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public String getObjectPath() {
 
     @Override
     public String getObjectPath() {

-        return null;
+        return objectPath;

     }
 
     @Override
     }
 
     @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);
+    public String getSelfNumber() {
+        return m.getSelfNumber();

     }
 
     }
 

-    private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
-        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
-
-        if (error == null) {
-            return;
+    @Override
+    public void addDevice(String uri) {
+        try {
+            m.addDeviceLink(new URI(uri));
+        } catch (IOException | InvalidKeyException e) {
+            throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+        } catch (URISyntaxException e) {
+            throw new Error.InvalidUri(e.getClass().getSimpleName()
+                    + " Device link uri has invalid format: "
+                    + e.getMessage());

         }
         }

+    }

 
 

-        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
-
-        if (result.getIdentityFailure() != null) {
-            throw new Error.UntrustedIdentity(message);
-        } else {
-            throw new Error.Failure(message);
+    @Override
+    public void removeDevice(int deviceId) {
+        try {
+            m.removeLinkedDevices(deviceId);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getClass().getSimpleName() + ": Error while removing device: " + e.getMessage());

         }
     }
 
         }
     }
 

-    private static void checkSendMessageResults(
-            long timestamp, List<SendMessageResult> results
-    ) throws DBusExecutionException {
-        if (results.size() == 1) {
-            checkSendMessageResult(timestamp, results.get(0));
-            return;
+    @Override
+    public List<String> listDevices() {
+        List<Device> devices;
+        try {
+            devices = m.getLinkedDevices();
+        } catch (IOException | Error.Failure e) {
+            throw new Error.Failure("Failed to get linked devices: " + e.getMessage());

         }
 
         }
 

-        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
-        if (errors.size() == 0) {
-            return;
-        }
+        return devices.stream().map(d -> d.getName() == null ? "" : d.getName()).collect(Collectors.toList());
+    }

 
 

-        var message = new StringBuilder();
-        message.append(timestamp).append('\n');
-        message.append("Failed to send (some) messages:\n");
-        for (var error : errors) {
-            message.append(error).append('\n');
+    @Override
+    public void updateDeviceName(String deviceName) {
+        try {
+            m.updateAccountAttributes(deviceName);
+        } catch (IOException | Signal.Error.Failure e) {
+            throw new Error.Failure("UpdateAccount error: " + e.getMessage());

         }
         }

+    }

 
 

-        throw new Error.Failure(message.toString());
+    @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);

     }
 
     @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(message, attachments, recipients);
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
+            final var results = m.sendMessage(new Message(message, attachments),
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                            .map(RecipientIdentifier.class::cast)
+                            .collect(Collectors.toSet()));
+
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

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

         }
     }
 
         }
     }
 


@@ -120,13 +154,16 @@ public class DbusSignalImpl implements Signal {
             final long targetSentTimestamp, final List<String> recipients
     ) {
         try {
             final long targetSentTimestamp, final List<String> recipients
     ) {
         try {

-            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, recipients);
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
+            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                            .map(RecipientIdentifier.class::cast)
+                            .collect(Collectors.toSet()));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());

         }
     }
 
         }
     }
 


@@ -135,12 +172,13 @@ public class DbusSignalImpl implements Signal {
             final long targetSentTimestamp, final byte[] groupId
     ) {
         try {
             final long targetSentTimestamp, final byte[] groupId
     ) {
         try {

-            final var results = m.sendGroupRemoteDeleteMessage(targetSentTimestamp, GroupId.unknownVersion(groupId));
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
+            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
+                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {

             throw new Error.GroupNotFound(e.getMessage());
         }
     }
             throw new Error.GroupNotFound(e.getMessage());
         }
     }


@@ -167,13 +205,70 @@ public class DbusSignalImpl implements Signal {
             final List<String> recipients
     ) {
         try {
             final List<String> recipients
     ) {
         try {

-            final var results = m.sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
+            final var results = m.sendMessageReaction(emoji,
+                    remove,
+                    getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
+                    targetSentTimestamp,
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                            .map(RecipientIdentifier.class::cast)
+                            .collect(Collectors.toSet()));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        }
+    }
+
+    @Override
+    public void sendTyping(
+            final String recipient, final boolean stop
+    ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
+        try {
+            var recipients = new ArrayList<String>(1);
+            recipients.add(recipient);
+            m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                            .map(RecipientIdentifier.class::cast)
+                            .collect(Collectors.toSet()));
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        } catch (UntrustedIdentityException e) {
+            throw new Error.UntrustedIdentity(e.getMessage());
+        }
+    }
+
+    @Override
+    public void sendReadReceipt(
+            final String recipient, final List<Long> messageIds
+    ) throws Error.Failure, Error.UntrustedIdentity {
+        try {
+            m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (UntrustedIdentityException e) {
+            throw new Error.UntrustedIdentity(e.getMessage());
+        }
+    }
+
+    @Override
+    public void sendContacts() {
+        try {
+            m.sendContacts();
+        } catch (IOException e) {
+            throw new Error.Failure("SendContacts error: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public void sendSyncRequest() {
+        try {
+            m.requestAllSyncData();
+        } catch (IOException e) {
+            throw new Error.Failure("Request sync data error: " + e.getMessage());

         }
     }
 
         }
     }
 


@@ -182,37 +277,39 @@ 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.sendSelfMessage(message, attachments);
-            checkSendMessageResult(results.first(), results.second());
-            return results.first();
+            final var results = m.sendMessage(new Message(message, attachments),
+                    Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

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

         }
     }
 
     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {
         }
     }
 
     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {

-            final var results = m.sendEndSessionMessage(recipients);
-            checkSendMessageResults(results.first(), results.second());
+            final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());

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

-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());

         }
     }
 
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {
         }
     }
 
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {

-            var results = m.sendGroupMessage(message, attachments, GroupId.unknownVersion(groupId));
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
+            var results = m.sendMessage(new Message(message, attachments),
+                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {

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


@@ -228,18 +325,16 @@ public class DbusSignalImpl implements Signal {
             final byte[] groupId
     ) {
         try {
             final byte[] groupId
     ) {
         try {

-            final var results = m.sendGroupMessageReaction(emoji,
+            final var results = m.sendMessageReaction(emoji,

                     remove,
                     remove,

-                    targetAuthor,
+                    getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),

                     targetSentTimestamp,
                     targetSentTimestamp,

-                    GroupId.unknownVersion(groupId));
-            checkSendMessageResults(results.first(), results.second());
-            return results.first();
+                    Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
+            checkSendMessageResults(results.getTimestamp(), results.getResults());
+            return results.getTimestamp();

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

-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {

             throw new Error.GroupNotFound(e.getMessage());
         }
     }
             throw new Error.GroupNotFound(e.getMessage());
         }
     }


@@ -248,41 +343,49 @@ public class DbusSignalImpl implements Signal {
     // the profile name
     @Override
     public String getContactName(final String number) {
     // the profile name
     @Override
     public String getContactName(final String number) {

-        try {
-            return m.getContactOrProfileName(number);
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
-        }
+        final var name = m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getSelfNumber()));
+        return name == null ? "" : name;

     }
 
     @Override
     public void setContactName(final String number, final String name) {
         try {
     }
 
     @Override
     public void setContactName(final String number, final String name) {
         try {

-            m.setContactName(number, name);
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
+            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name);

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

+        } catch (UnregisteredUserException e) {
+            throw new Error.Failure("Contact is not registered.");
+        }
+    }
+
+    @Override
+    public void setExpirationTimer(final String number, final int expiration) {
+        try {
+            m.setExpirationTimer(getSingleRecipientIdentifier(number, m.getSelfNumber()), expiration);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());

         }
     }
 
     @Override
     public void setContactBlocked(final String number, final boolean blocked) {
         try {
         }
     }
 
     @Override
     public void setContactBlocked(final String number, final boolean blocked) {
         try {

-            m.setContactBlocked(number, blocked);
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
+            m.setContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()), blocked);

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

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

         }
     }
 
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
         }
     }
 
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {

-            m.setGroupBlocked(GroupId.unknownVersion(groupId), blocked);
+            m.setGroupBlocked(getGroupId(groupId), blocked);

         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());
         } catch (GroupNotFoundException e) {
             throw new Error.GroupNotFound(e.getMessage());

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

         }
     }
 
         }
     }
 


@@ -298,8 +401,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public String getGroupName(final byte[] groupId) {
 
     @Override
     public String getGroupName(final byte[] groupId) {

-        var group = m.getGroup(GroupId.unknownVersion(groupId));
-        if (group == null) {
+        var group = m.getGroup(getGroupId(groupId));
+        if (group == null || group.getTitle() == null) {

             return "";
         } else {
             return group.getTitle();
             return "";
         } else {
             return group.getTitle();


@@ -308,53 +411,49 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {

-        var group = m.getGroup(GroupId.unknownVersion(groupId));
+        var group = m.getGroup(getGroupId(groupId));

         if (group == null) {
             return List.of();
         } else {
         if (group == null) {
             return List.of();
         } else {

-            return group.getMembers()
-                    .stream()
-                    .map(m::resolveSignalServiceAddress)
-                    .map(SignalServiceAddress::getLegacyIdentifier)
-                    .collect(Collectors.toList());
+            return group.getMembers().stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toList());

         }
     }
 
     @Override
     public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
         try {
         }
     }
 
     @Override
     public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
         try {

-            if (groupId.length == 0) {
-                groupId = null;
-            }
-            if (name.isEmpty()) {
-                name = null;
-            }
-            if (members.isEmpty()) {
-                members = null;
-            }
-            if (avatar.isEmpty()) {
-                avatar = null;
-            }
+            groupId = nullIfEmpty(groupId);
+            name = nullIfEmpty(name);
+            avatar = nullIfEmpty(avatar);
+            final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());

             if (groupId == null) {
             if (groupId == null) {

-                final var results = m.createGroup(name, members, avatar == null ? null : new File(avatar));
-                checkSendMessageResults(0, results.second());
+                final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
+                checkSendMessageResults(results.second().getTimestamp(), results.second().getResults());

                 return results.first().serialize();
             } else {
                 return results.first().serialize();
             } else {

-                final var results = m.updateGroup(GroupId.unknownVersion(groupId),
+                final var results = m.updateGroup(getGroupId(groupId),

                         name,
                         null,
                         name,
                         null,

-                        members,
+                        memberIdentifiers,
+                        null,
+                        null,
+                        null,
+                        false,

                         null,
                         null,

-                        avatar == null ? null : new File(avatar));
-                checkSendMessageResults(results.first(), results.second());
+                        null,
+                        null,
+                        avatar == null ? null : new File(avatar),
+                        null,
+                        null);
+                if (results != null) {
+                    checkSendMessageResults(results.getTimestamp(), results.getResults());
+                }

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

-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {

             throw new Error.GroupNotFound(e.getMessage());
             throw new Error.GroupNotFound(e.getMessage());

-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());

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


@@ -365,27 +464,89 @@ public class DbusSignalImpl implements Signal {
         return true;
     }
 
         return true;
     }
 

+    @Override
+    public boolean isRegistered(String number) {
+        var result = isRegistered(List.of(number));
+        return result.get(0);
+    }
+
+    @Override
+    public List<Boolean> isRegistered(List<String> numbers) {
+        var results = new ArrayList<Boolean>();
+        if (numbers.isEmpty()) {
+            return results;
+        }
+
+        Map<String, Pair<String, UUID>> registered;
+        try {
+            registered = m.areUsersRegistered(new HashSet<>(numbers));
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+
+        return numbers.stream().map(number -> {
+            var uuid = registered.get(number).second();
+            return uuid != null;
+        }).collect(Collectors.toList());
+    }
+

     @Override
     public void updateProfile(
     @Override
     public void updateProfile(

-            final String name,
-            final String about,
-            final String aboutEmoji,
+            String givenName,
+            String familyName,
+            String about,
+            String aboutEmoji,

             String avatarPath,
             final boolean removeAvatar
     ) {
         try {
             String avatarPath,
             final boolean removeAvatar
     ) {
         try {

-            if (avatarPath.isEmpty()) {
-                avatarPath = null;
-            }
+            givenName = nullIfEmpty(givenName);
+            familyName = nullIfEmpty(familyName);
+            about = nullIfEmpty(about);
+            aboutEmoji = nullIfEmpty(aboutEmoji);
+            avatarPath = nullIfEmpty(avatarPath);

             Optional<File> avatarFile = removeAvatar
                     ? Optional.absent()
                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             Optional<File> avatarFile = removeAvatar
                     ? Optional.absent()
                     : avatarPath == null ? null : Optional.of(new File(avatarPath));

-            m.setProfile(name, null, about, aboutEmoji, avatarFile);
+            m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);

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

+    @Override
+    public void updateProfile(
+            final String name,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {
+        updateProfile(name, "", about, aboutEmoji, avatarPath, removeAvatar);
+    }
+
+    @Override
+    public void removePin() {
+        try {
+            m.setRegistrationLockPin(Optional.absent());
+        } catch (UnauthenticatedResponseException e) {
+            throw new Error.Failure("Remove pin failed with unauthenticated response: " + e.getMessage());
+        } catch (IOException e) {
+            throw new Error.Failure("Remove pin error: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public void setPin(String registrationLockPin) {
+        try {
+            m.setRegistrationLockPin(Optional.of(registrationLockPin));
+        } catch (UnauthenticatedResponseException e) {
+            throw new Error.Failure("Set pin error failed with unauthenticated response: " + e.getMessage());
+        } catch (IOException e) {
+            throw new Error.Failure("Set pin error: " + e.getMessage());
+        }
+    }
+

     // Provide option to query a version string in order to react on potential
     // future interface changes
     @Override
     // Provide option to query a version string in order to react on potential
     // future interface changes
     @Override


@@ -397,10 +558,9 @@ public class DbusSignalImpl implements Signal {
     // all numbers the system knows
     @Override
     public List<String> listNumbers() {
     // all numbers the system knows
     @Override
     public List<String> listNumbers() {

-        return Stream.concat(m.getIdentities().stream().map(IdentityInfo::getRecipientId),
+        return Stream.concat(m.getIdentities().stream().map(Identity::getRecipient),

                 m.getContacts().stream().map(Pair::first))
                 m.getContacts().stream().map(Pair::first))

-                .map(m::resolveSignalServiceAddress)
-                .map(a -> a.getNumber().orNull())
+                .map(a -> a.getNumber().orElse(null))

                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());


@@ -413,16 +573,19 @@ public class DbusSignalImpl implements Signal {
         var contacts = m.getContacts();
         for (var c : contacts) {
             if (name.equals(c.second().getName())) {
         var contacts = m.getContacts();
         for (var c : contacts) {
             if (name.equals(c.second().getName())) {

-                numbers.add(m.resolveSignalServiceAddress(c.first()).getLegacyIdentifier());
+                numbers.add(c.first().getLegacyIdentifier());

             }
         }
         // Try profiles if no contact name was found
         for (var identity : m.getIdentities()) {
             }
         }
         // Try profiles if no contact name was found
         for (var identity : m.getIdentities()) {

-            final var recipientId = identity.getRecipientId();
-            final var address = m.resolveSignalServiceAddress(recipientId);
-            var number = address.getNumber().orNull();
+            final var address = identity.getRecipient();
+            var number = address.getNumber().orElse(null);

             if (number != null) {
             if (number != null) {

-                var profile = m.getRecipientProfile(recipientId);
+                Profile profile = null;
+                try {
+                    profile = m.getRecipientProfile(RecipientIdentifier.Single.fromAddress(address));
+                } catch (UnregisteredUserException ignored) {
+                }

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


@@ -433,24 +596,25 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void quitGroup(final byte[] groupId) {
 
     @Override
     public void quitGroup(final byte[] groupId) {

-        var group = GroupId.unknownVersion(groupId);
+        var group = getGroupId(groupId);

         try {
         try {

-            m.sendQuitGroupMessage(group);
+            m.quitGroup(group, Set.of());

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

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

             throw new Error.Failure(e.getMessage());
         }
     }
 
     @Override
             throw new Error.Failure(e.getMessage());
         }
     }
 
     @Override

-    public void joinGroup(final String groupLink) {
+    public byte[] joinGroup(final String groupLink) {

         try {
             final var linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
             if (linkUrl == null) {
                 throw new Error.Failure("Group link is invalid:");
             }
         try {
             final var linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
             if (linkUrl == null) {
                 throw new Error.Failure("Group link is invalid:");
             }

-            m.joinGroup(linkUrl);
+            final var result = m.joinGroup(linkUrl);
+            return result.first().serialize();

         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());
         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());
         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {


@@ -462,16 +626,12 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public boolean isContactBlocked(final String number) {
 
     @Override
     public boolean isContactBlocked(final String number) {

-        try {
-            return m.isContactBlocked(number);
-        } catch (InvalidNumberException e) {
-            throw new Error.InvalidNumber(e.getMessage());
-        }
+        return m.isContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()));

     }
 
     @Override
     public boolean isGroupBlocked(final byte[] groupId) {
     }
 
     @Override
     public boolean isGroupBlocked(final byte[] groupId) {

-        var group = m.getGroup(GroupId.unknownVersion(groupId));
+        var group = m.getGroup(getGroupId(groupId));

         if (group == null) {
             return false;
         } else {
         if (group == null) {
             return false;
         } else {


@@ -481,11 +641,122 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public boolean isMember(final byte[] groupId) {
 
     @Override
     public boolean isMember(final byte[] groupId) {

-        var group = m.getGroup(GroupId.unknownVersion(groupId));
+        var group = m.getGroup(getGroupId(groupId));

         if (group == null) {
             return false;
         } else {
         if (group == null) {
             return false;
         } else {

-            return group.isMember(m.getSelfRecipientId());
+            return group.isMember();
+        }
+    }
+
+    @Override
+    public String uploadStickerPack(String stickerPackPath) {
+        File path = new File(stickerPackPath);
+        try {
+            return m.uploadStickerPack(path).toString();
+        } catch (IOException e) {
+            throw new Error.Failure("Upload error (maybe image size is too large):" + e.getMessage());
+        } catch (StickerPackInvalidException e) {
+            throw new Error.Failure("Invalid sticker pack: " + e.getMessage());
+        }
+    }
+
+    private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
+        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+
+        if (error == null) {
+            return;

         }
         }

+
+        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';
+
+        if (result.getIdentityFailure() != null) {
+            throw new Error.UntrustedIdentity(message);
+        } else {
+            throw new Error.Failure(message);
+        }
+    }
+
+    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());
+            return;
+        }
+
+        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+        if (errors.size() == 0) {
+            return;
+        }
+
+        var message = new StringBuilder();
+        message.append(timestamp).append('\n');
+        message.append("Failed to send (some) messages:\n");
+        for (var error : errors) {
+            message.append(error).append('\n');
+        }
+
+        throw new Error.Failure(message.toString());
+    }
+
+    private static void checkSendMessageResults(
+            long timestamp, Collection<SendMessageResult> results
+    ) throws DBusExecutionException {
+        if (results.size() == 1) {
+            checkSendMessageResult(timestamp, results.stream().findFirst().get());
+            return;
+        }
+
+        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+        if (errors.size() == 0) {
+            return;
+        }
+
+        var message = new StringBuilder();
+        message.append(timestamp).append('\n');
+        message.append("Failed to send (some) messages:\n");
+        for (var error : errors) {
+            message.append(error).append('\n');
+        }
+
+        throw new Error.Failure(message.toString());
+    }
+
+    private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
+            final Collection<String> recipientStrings, final String localNumber
+    ) throws DBusExecutionException {
+        final var identifiers = new HashSet<RecipientIdentifier.Single>();
+        for (var recipientString : recipientStrings) {
+            identifiers.add(getSingleRecipientIdentifier(recipientString, localNumber));
+        }
+        return identifiers;
+    }
+
+    private static RecipientIdentifier.Single getSingleRecipientIdentifier(
+            final String recipientString, final String localNumber
+    ) throws DBusExecutionException {
+        try {
+            return RecipientIdentifier.Single.fromString(recipientString, localNumber);
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        }
+    }
+
+    private static GroupId getGroupId(byte[] groupId) throws DBusExecutionException {
+        try {
+            return GroupId.unknownVersion(groupId);
+        } catch (Throwable e) {
+            throw new Error.InvalidGroupId("Invalid group id: " + e.getMessage());
+        }
+    }
+
+    private byte[] nullIfEmpty(final byte[] array) {
+        return array.length == 0 ? null : array;
+    }
+
+    private String nullIfEmpty(final String name) {
+        return name.isEmpty() ? null : name;

     }
 }
     }
 }