Replace deprecated DBusMap

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 6bb93677f15e030c5a836aecdcd51821416015a4..9ae3001a6cf55975d7adff3c5e175e51b7709a21 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -1,49 +1,65 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;

-import org.asamk.signal.DbusConfig;

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

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

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

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

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

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

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

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

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

+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;

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

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

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

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

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

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

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

-import org.asamk.signal.manager.api.NotMasterDeviceException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;

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

+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
+import org.asamk.signal.manager.api.RecipientAddress;

 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;

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

 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;

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

 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.api.UpdateGroup;

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

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

-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.GroupPermission;
-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.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
-import org.asamk.signal.manager.storage.recipients.Recipient;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.freedesktop.dbus.DBusMap;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;

 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;

+import org.freedesktop.dbus.exceptions.DBusExecutionException;

 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.interfaces.DBusSigHandler;
 import org.freedesktop.dbus.types.Variant;
 
 import java.io.File;
 import java.io.IOException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.interfaces.DBusSigHandler;
 import org.freedesktop.dbus.types.Variant;
 
 import java.io.File;
 import java.io.IOException;

+import java.io.InputStream;

 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;


@@ -56,6 +72,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;

+import java.util.concurrent.atomic.AtomicInteger;

 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;


@@ -74,13 +91,16 @@ public class DbusManagerImpl implements Manager {
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
     private final List<Runnable> closedListeners = new ArrayList<>();
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
     private final List<Runnable> closedListeners = new ArrayList<>();

+    private final String busname;

     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;

+    private DBusSigHandler<Signal.EditMessageReceived> dbusEditMsgHandler;

     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
 
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
 

-    public DbusManagerImpl(final Signal signal, DBusConnection connection) {
+    public DbusManagerImpl(final Signal signal, DBusConnection connection, final String busname) {

         this.signal = signal;
         this.connection = connection;
         this.signal = signal;
         this.connection = connection;

+        this.busname = busname;

     }
 
     @Override
     }
 
     @Override


@@ -104,10 +124,22 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void updateAccountAttributes(final String deviceName) throws IOException {
+    public Map<String, UsernameStatus> getUsernameStatus(final Set<String> usernames) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void updateAccountAttributes(
+            final String deviceName,
+            final Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException {

         if (deviceName != null) {
             final var devicePath = signal.getThisDevice();
             getRemoteObject(devicePath, Signal.Device.class).Set("org.asamk.Signal.Device", "Name", deviceName);
         if (deviceName != null) {
             final var devicePath = signal.getThisDevice();
             getRemoteObject(devicePath, Signal.Device.class).Set("org.asamk.Signal.Device", "Name", deviceName);

+        } else {
+            throw new UnsupportedOperationException();

         }
     }
 
         }
     }
 


@@ -122,7 +154,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void updateConfiguration(Configuration newConfiguration) throws IOException {
+    public void updateConfiguration(Configuration newConfiguration) {

         final var configuration = getRemoteObject(new DBusPath(signal.getObjectPath() + "/Configuration"),
                 Signal.Configuration.class);
         newConfiguration.readReceipts()
         final var configuration = getRemoteObject(new DBusPath(signal.getObjectPath() + "/Configuration"),
                 Signal.Configuration.class);
         newConfiguration.readReceipts()


@@ -138,19 +170,47 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void setProfile(
-            final String givenName,
-            final String familyName,
-            final String about,
-            final String aboutEmoji,
-            final Optional<File> avatar
-    ) throws IOException {
-        signal.updateProfile(emptyIfNull(givenName),
-                emptyIfNull(familyName),
-                emptyIfNull(about),
-                emptyIfNull(aboutEmoji),
-                avatar == null ? "" : avatar.map(File::getPath).orElse(""),
-                avatar != null && avatar.isEmpty());
+    public void updateProfile(UpdateProfile updateProfile) throws IOException {
+        signal.updateProfile(emptyIfNull(updateProfile.getGivenName()),
+                emptyIfNull(updateProfile.getFamilyName()),
+                emptyIfNull(updateProfile.getAbout()),
+                emptyIfNull(updateProfile.getAboutEmoji()),
+                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar(),
+                updateProfile.isDeleteAvatar());
+    }
+
+    @Override
+    public String getUsername() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public UsernameLinkUrl getUsernameLink() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setUsername(final String username) throws IOException, InvalidUsernameException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void startChangeNumber(
+            final String newNumber, final boolean voiceVerification, final String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void finishChangeNumber(
+            final String newNumber, final String verificationCode, final String pin
+    ) throws IncorrectPinException, PinLockedException, IOException {
+        throw new UnsupportedOperationException();

     }
 
     @Override
     }
 
     @Override


@@ -189,8 +249,8 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void addDeviceLink(final URI linkUri) throws IOException, InvalidDeviceLinkException {
-        signal.addDevice(linkUri.toString());
+    public void addDeviceLink(final DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException {
+        signal.addDevice(linkUri.createDeviceLinkUri().toString());

     }
 
     @Override
     }
 
     @Override


@@ -202,11 +262,6 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
         }
     }
 

-    @Override
-    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
-    }
-

     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();


@@ -217,11 +272,19 @@ public class DbusManagerImpl implements Manager {
     public SendGroupMessageResults quitGroup(
             final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
     public SendGroupMessageResults quitGroup(
             final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {

-        if (groupAdmins.size() > 0) {
+        if (!groupAdmins.isEmpty()) {

             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);

-        group.quitGroup();
+        try {
+            group.quitGroup();
+        } catch (Signal.Error.GroupNotFound e) {
+            throw new GroupNotFoundException(groupId);
+        } catch (Signal.Error.NotAGroupMember e) {
+            throw new NotAGroupMemberException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        } catch (Signal.Error.LastGroupAdmin e) {
+            throw new LastGroupAdminException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        }

         return new SendGroupMessageResults(0, List.of());
     }
 
         return new SendGroupMessageResults(0, List.of());
     }
 


@@ -233,11 +296,11 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(

-            final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
+            final String name, final Set<RecipientIdentifier.Single> members, final String avatarFile

     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),

-                avatarFile == null ? "" : avatarFile.getPath());
+                avatarFile == null ? "" : avatarFile);

         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 


@@ -255,7 +318,7 @@ public class DbusManagerImpl implements Manager {
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",

-                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile().getPath());
+                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile());

         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());
         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());


@@ -306,8 +369,13 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> joinGroup(final GroupInviteLinkUrl inviteLinkUrl) throws IOException, InactiveGroupLinkException {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> joinGroup(final GroupInviteLinkUrl inviteLinkUrl) throws IOException, InactiveGroupLinkException {

-        final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
-        return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        try {
+            final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
+            return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        } catch (DBusExecutionException e) {
+            throw new IOException("Failed to join group: " + e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                    e);
+        }

     }
 
     @Override
     }
 
     @Override


@@ -344,7 +412,7 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessage(
 
     @Override
     public SendMessageResults sendMessage(

-            final Message message, final Set<RecipientIdentifier> recipients
+            final Message message, final Set<RecipientIdentifier> recipients, final boolean notifySelf

     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),


@@ -352,6 +420,13 @@ public class DbusManagerImpl implements Manager {
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 

+    @Override
+    public SendMessageResults sendEditMessage(
+            final Message message, final Set<RecipientIdentifier> recipients, final long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public SendMessageResults sendRemoteDeleteMessage(
             final long targetSentTimestamp, final Set<RecipientIdentifier> recipients
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
             final long targetSentTimestamp, final Set<RecipientIdentifier> recipients


@@ -368,7 +443,8 @@ public class DbusManagerImpl implements Manager {
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,

-            final Set<RecipientIdentifier> recipients
+            final Set<RecipientIdentifier> recipients,
+            final boolean isStory

     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,


@@ -392,7 +468,8 @@ public class DbusManagerImpl implements Manager {
     public SendMessageResults sendPaymentNotificationMessage(
             final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
     ) throws IOException {
     public SendMessageResults sendPaymentNotificationMessage(
             final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
     ) throws IOException {

-        throw new UnsupportedOperationException();
+        final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier());
+        return new SendMessageResults(timestamp, Map.of());

     }
 
     @Override
     }
 
     @Override


@@ -401,6 +478,18 @@ public class DbusManagerImpl implements Manager {
         return new SendMessageResults(0, Map.of());
     }
 
         return new SendMessageResults(0, Map.of());
     }
 

+    @Override
+    public SendMessageResults sendMessageRequestResponse(
+            final MessageEnvelope.Sync.MessageRequestResponse.Type type,
+            final Set<RecipientIdentifier> recipientIdentifiers
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void hideRecipient(final RecipientIdentifier.Single recipient) {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
         signal.deleteRecipient(recipient.getIdentifier());
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
         signal.deleteRecipient(recipient.getIdentifier());


@@ -413,15 +502,15 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
 
     @Override
     public void setContactName(

-            final RecipientIdentifier.Single recipient, final String name
-    ) throws NotMasterDeviceException {
-        signal.setContactName(recipient.getIdentifier(), name);
+            final RecipientIdentifier.Single recipient, final String givenName, final String familyName
+    ) throws NotPrimaryDeviceException {
+        signal.setContactName(recipient.getIdentifier(), givenName);

     }
 
     @Override
     public void setContactsBlocked(
             final Collection<RecipientIdentifier.Single> recipients, final boolean blocked
     }
 
     @Override
     public void setContactsBlocked(
             final Collection<RecipientIdentifier.Single> recipients, final boolean blocked

-    ) throws NotMasterDeviceException, IOException {
+    ) throws NotPrimaryDeviceException, IOException {

         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
         }
         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
         }


@@ -457,6 +546,11 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
         }
     }
 

+    @Override
+    public void installStickerPack(final StickerPackUrl url) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public List<StickerPack> getStickerPacks() {
         throw new UnsupportedOperationException();
     @Override
     public List<StickerPack> getStickerPacks() {
         throw new UnsupportedOperationException();


@@ -473,7 +567,7 @@ public class DbusManagerImpl implements Manager {
             if (isWeakListener) {
                 weakHandlers.add(handler);
             } else {
             if (isWeakListener) {
                 weakHandlers.add(handler);
             } else {

-                if (messageHandlers.size() == 0) {
+                if (messageHandlers.isEmpty()) {

                     installMessageHandlers();
                 }
                 messageHandlers.add(handler);
                     installMessageHandlers();
                 }
                 messageHandlers.add(handler);


@@ -486,7 +580,7 @@ public class DbusManagerImpl implements Manager {
         synchronized (messageHandlers) {
             weakHandlers.remove(handler);
             messageHandlers.remove(handler);
         synchronized (messageHandlers) {
             weakHandlers.remove(handler);
             messageHandlers.remove(handler);

-            if (messageHandlers.size() == 0) {
+            if (messageHandlers.isEmpty()) {

                 uninstallMessageHandlers();
             }
         }
                 uninstallMessageHandlers();
             }
         }


@@ -495,53 +589,71 @@ public class DbusManagerImpl implements Manager {
     @Override
     public boolean isReceiving() {
         synchronized (messageHandlers) {
     @Override
     public boolean isReceiving() {
         synchronized (messageHandlers) {

-            return messageHandlers.size() > 0;
+            return !messageHandlers.isEmpty();

         }
     }
 
         }
     }
 

-    @Override
-    public void receiveMessages(final ReceiveMessageHandler handler) throws IOException {
-        addReceiveHandler(handler);
-        try {
-            synchronized (this) {
-                this.wait();
-            }
-        } catch (InterruptedException ignored) {
-        }
-        removeReceiveHandler(handler);
-    }
+    private Thread receiveThread;

 
     @Override
     public void receiveMessages(
 
     @Override
     public void receiveMessages(

-            final Duration timeout, final ReceiveMessageHandler handler
-    ) throws IOException {
+            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException {
+        if (receiveThread != null) {
+            throw new AlreadyReceivingException("Already receiving message.");
+        }
+        receiveThread = Thread.currentThread();
+
+        final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));

         final var lastMessage = new AtomicLong(System.currentTimeMillis());
         final var lastMessage = new AtomicLong(System.currentTimeMillis());

+        final var thread = Thread.currentThread();

 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);
 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);

+            if (remainingMessages.get() > 0) {
+                if (remainingMessages.decrementAndGet() <= 0) {
+                    remainingMessages.set(0);
+                    thread.interrupt();
+                }
+            }

         };
         addReceiveHandler(receiveHandler);
         };
         addReceiveHandler(receiveHandler);

-        while (true) {
-            try {
-                final var sleepTimeRemaining = timeout.toMillis() - (System.currentTimeMillis() - lastMessage.get());
-                if (sleepTimeRemaining < 0) {
+        if (timeout.isPresent()) {
+            while (remainingMessages.get() != 0) {
+                try {
+                    final var passedTime = System.currentTimeMillis() - lastMessage.get();
+                    final var sleepTimeRemaining = timeout.get().toMillis() - passedTime;
+                    if (sleepTimeRemaining < 0) {
+                        break;
+                    }
+                    Thread.sleep(sleepTimeRemaining);
+                } catch (InterruptedException ignored) {

                     break;
                 }
                     break;
                 }

-                Thread.sleep(sleepTimeRemaining);
+            }
+        } else {
+            try {
+                synchronized (this) {
+                    this.wait();
+                }

             } catch (InterruptedException ignored) {
             }
         }
             } catch (InterruptedException ignored) {
             }
         }

+

         removeReceiveHandler(receiveHandler);
         removeReceiveHandler(receiveHandler);

+        receiveThread = null;

     }
 
     @Override
     }
 
     @Override

-    public void setIgnoreAttachments(final boolean ignoreAttachments) {
+    public void stopReceiveMessages() {
+        if (receiveThread != null) {
+            receiveThread.interrupt();
+        }

     }
 
     @Override
     }
 
     @Override

-    public boolean hasCaughtUpWithOldMessages() {
-        return true;
+    public void setReceiveConfig(final ReceiveConfig receiveConfig) {

     }
 
     @Override
     }
 
     @Override


@@ -571,15 +683,29 @@ public class DbusManagerImpl implements Manager {
                 return null;
             }
             final var contactName = signal.getContactName(n);
                 return null;
             }
             final var contactName = signal.getContactName(n);

-            if (onlyContacts && contactName.length() == 0) {
+            if (onlyContacts && contactName.isEmpty()) {

                 return null;
             }
             if (name.isPresent() && !name.get().equals(contactName)) {
                 return null;
             }
             return Recipient.newBuilder()
                 return null;
             }
             if (name.isPresent() && !name.get().equals(contactName)) {
                 return null;
             }
             return Recipient.newBuilder()

-                    .withAddress(new RecipientAddress(null, n))
-                    .withContact(new Contact(contactName, null, 0, contactBlocked, false, false))
+                    .withAddress(new RecipientAddress(n))
+                    .withContact(new Contact(contactName,
+                            null,
+                            null,
+                            null,
+                            null,
+                            null,
+                            null,
+                            0,
+                            0,
+                            false,
+                            contactBlocked,
+                            false,
+                            false,
+                            false,
+                            null))

                     .build();
         }).filter(Objects::nonNull).toList();
     }
                     .build();
         }).filter(Objects::nonNull).toList();
     }


@@ -605,19 +731,19 @@ public class DbusManagerImpl implements Manager {
                     (String) group.get("Description").getValue(),
                     GroupInviteLinkUrl.fromUri((String) group.get("GroupInviteLink").getValue()),
                     ((List<String>) group.get("Members").getValue()).stream()
                     (String) group.get("Description").getValue(),
                     GroupInviteLinkUrl.fromUri((String) group.get("GroupInviteLink").getValue()),
                     ((List<String>) group.get("Members").getValue()).stream()

-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))

                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("PendingMembers").getValue()).stream()
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("PendingMembers").getValue()).stream()

-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))

                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("RequestingMembers").getValue()).stream()
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("RequestingMembers").getValue()).stream()

-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))

                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()

-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))

                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Banned").getValue()).stream()
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Banned").getValue()).stream()

-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))

                             .collect(Collectors.toSet()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
                             .collect(Collectors.toSet()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),


@@ -633,29 +759,31 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
 
     @Override
     public List<Identity> getIdentities() {

-        throw new UnsupportedOperationException();
+        final var identities = signal.listIdentities();
+        return identities.stream().map(Signal.StructIdentity::getObjectPath).map(this::getIdentity).toList();

     }
 
     @Override
     public List<Identity> getIdentities(final RecipientIdentifier.Single recipient) {
     }
 
     @Override
     public List<Identity> getIdentities(final RecipientIdentifier.Single recipient) {

-        throw new UnsupportedOperationException();
+        final var path = signal.getIdentity(recipient.getIdentifier());
+        return List.of(getIdentity(path));

     }
 
     }
 

-    @Override
-    public boolean trustIdentityVerified(final RecipientIdentifier.Single recipient, final byte[] fingerprint) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final String safetyNumber
-    ) {
-        throw new UnsupportedOperationException();
+    private Identity getIdentity(final DBusPath identityPath) {
+        final var group = getRemoteObject(identityPath, Signal.Identity.class).GetAll("org.asamk.Signal.Identity");
+        final var aci = (String) group.get("Uuid").getValue();
+        final var number = (String) group.get("Number").getValue();
+        return new Identity(new RecipientAddress(aci, null, number, null),
+                (byte[]) group.get("Fingerprint").getValue(),
+                (String) group.get("SafetyNumber").getValue(),
+                (byte[]) group.get("ScannableSafetyNumber").getValue(),
+                TrustLevel.valueOf((String) group.get("TrustLevel").getValue()),
+                (Long) group.get("AddedDate").getValue());

     }
 
     @Override
     }
 
     @Override

-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final byte[] safetyNumber
+    public boolean trustIdentityVerified(
+            final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode

     ) {
         throw new UnsupportedOperationException();
     }
     ) {
         throw new UnsupportedOperationException();
     }


@@ -682,7 +810,7 @@ public class DbusManagerImpl implements Manager {
             this.notify();
         }
         synchronized (messageHandlers) {
             this.notify();
         }
         synchronized (messageHandlers) {

-            if (messageHandlers.size() > 0) {
+            if (!messageHandlers.isEmpty()) {

                 uninstallMessageHandlers();
             }
             weakHandlers.clear();
                 uninstallMessageHandlers();
             }
             weakHandlers.clear();


@@ -706,7 +834,7 @@ public class DbusManagerImpl implements Manager {
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)
                 .toList();
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)
                 .toList();

-        if (singleRecipients.size() > 0) {
+        if (!singleRecipients.isEmpty()) {

             timestamp = recipientsHandler.apply(singleRecipients);
         }
 
             timestamp = recipientsHandler.apply(singleRecipients);
         }
 


@@ -730,7 +858,7 @@ public class DbusManagerImpl implements Manager {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {

-            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);
+            return connection.getRemoteObject(busname, path.getPath(), type);

         } catch (DBusException e) {
             throw new AssertionError(e);
         }
         } catch (DBusException e) {
             throw new AssertionError(e);
         }


@@ -740,8 +868,7 @@ public class DbusManagerImpl implements Manager {
         try {
             this.dbusMsgHandler = messageReceived -> {
                 final var extras = messageReceived.getExtras();
         try {
             this.dbusMsgHandler = messageReceived -> {
                 final var extras = messageReceived.getExtras();

-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        messageReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),

                         0,
                         messageReceived.getTimestamp(),
                         0,
                         0,
                         messageReceived.getTimestamp(),
                         0,


@@ -755,12 +882,14 @@ public class DbusManagerImpl implements Manager {
                                         messageReceived.getGroupId()), false, 0))
                                         : Optional.empty(),
                                 Optional.empty(),
                                         messageReceived.getGroupId()), false, 0))
                                         : Optional.empty(),
                                 Optional.empty(),

+                                Optional.empty(),

                                 Optional.of(messageReceived.getMessage()),
                                 0,
                                 false,
                                 false,
                                 false,
                                 false,
                                 Optional.of(messageReceived.getMessage()),
                                 0,
                                 false,
                                 false,
                                 false,
                                 false,

+                                false,

                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),


@@ -768,13 +897,58 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 List.of(),
                                 Optional.empty(),
                                 Optional.empty(),
                                 List.of(),

+                                getMentions(extras),

                                 List.of(),
                                 List.of())),
                         Optional.empty(),
                                 List.of(),
                                 List.of())),
                         Optional.empty(),

+                        Optional.empty(),
+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);

+            this.dbusEditMsgHandler = messageReceived -> {
+                final var extras = messageReceived.getExtras();
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),
+                        0,
+                        messageReceived.getTimestamp(),
+                        0,
+                        0,
+                        false,
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.of(new MessageEnvelope.Edit(messageReceived.getTargetSentTimestamp(),
+                                new MessageEnvelope.Data(messageReceived.getTimestamp(),
+                                        messageReceived.getGroupId().length > 0
+                                                ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
+                                                messageReceived.getGroupId()), false, 0))
+                                                : Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.of(messageReceived.getMessage()),
+                                        0,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        getAttachments(extras),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        List.of(),
+                                        getMentions(extras),
+                                        List.of(),
+                                        List.of()))),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty());
+                notifyMessageHandlers(envelope);
+            };
+            connection.addSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);

 
             this.dbusRcptHandler = receiptReceived -> {
                 final var type = switch (receiptReceived.getReceiptType()) {
 
             this.dbusRcptHandler = receiptReceived -> {
                 final var type = switch (receiptReceived.getReceiptType()) {


@@ -783,8 +957,7 @@ public class DbusManagerImpl implements Manager {
                     case "delivery" -> MessageEnvelope.Receipt.Type.DELIVERY;
                     default -> MessageEnvelope.Receipt.Type.UNKNOWN;
                 };
                     case "delivery" -> MessageEnvelope.Receipt.Type.DELIVERY;
                     default -> MessageEnvelope.Receipt.Type.UNKNOWN;
                 };

-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        receiptReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(receiptReceived.getSender())),

                         0,
                         receiptReceived.getTimestamp(),
                         0,
                         0,
                         receiptReceived.getTimestamp(),
                         0,


@@ -796,6 +969,8 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),

+                        Optional.empty(),
+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };


@@ -803,8 +978,7 @@ public class DbusManagerImpl implements Manager {
 
             this.dbusSyncHandler = syncReceived -> {
                 final var extras = syncReceived.getExtras();
 
             this.dbusSyncHandler = syncReceived -> {
                 final var extras = syncReceived.getExtras();

-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        syncReceived.getSource())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(syncReceived.getSource())),

                         0,
                         syncReceived.getTimestamp(),
                         0,
                         0,
                         syncReceived.getTimestamp(),
                         0,


@@ -813,11 +987,12 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),

+                        Optional.empty(),

                         Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()
                                         ? Optional.empty()
                         Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()
                                         ? Optional.empty()

-                                        : Optional.of(new RecipientAddress(null, syncReceived.getDestination())),
+                                        : Optional.of(new RecipientAddress(syncReceived.getDestination())),

                                 Set.of(),
                                 Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),
                                         syncReceived.getGroupId().length > 0
                                 Set.of(),
                                 Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),
                                         syncReceived.getGroupId().length > 0


@@ -825,12 +1000,14 @@ public class DbusManagerImpl implements Manager {
                                                 syncReceived.getGroupId()), false, 0))
                                                 : Optional.empty(),
                                         Optional.empty(),
                                                 syncReceived.getGroupId()), false, 0))
                                                 : Optional.empty(),
                                         Optional.empty(),

+                                        Optional.empty(),

                                         Optional.of(syncReceived.getMessage()),
                                         0,
                                         false,
                                         false,
                                         false,
                                         false,
                                         Optional.of(syncReceived.getMessage()),
                                         0,
                                         false,
                                         false,
                                         false,
                                         false,

+                                        false,

                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),


@@ -838,8 +1015,11 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         Optional.empty(),
                                         List.of(),
                                         Optional.empty(),
                                         Optional.empty(),
                                         List.of(),

+                                        getMentions(extras),

                                         List.of(),
                                         List.of(),

-                                        List.of())))),
+                                        List.of())),
+                                Optional.empty(),
+                                Optional.empty())),

                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),


@@ -847,12 +1027,13 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty())),
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty())),

+                        Optional.empty(),

                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {

-            e.printStackTrace();
+            throw new RuntimeException(e);

         }
         signal.subscribeReceive();
     }
         }
         signal.subscribeReceive();
     }


@@ -868,10 +1049,11 @@ public class DbusManagerImpl implements Manager {
         try {
             signal.unsubscribeReceive();
             connection.removeSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
         try {
             signal.unsubscribeReceive();
             connection.removeSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);

+            connection.removeSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);

             connection.removeSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
             connection.removeSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
             connection.removeSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
             connection.removeSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {

-            e.printStackTrace();
+            throw new RuntimeException(e);

         }
     }
 
         }
     }
 


@@ -880,7 +1062,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
             return List.of();
         }
 

-        final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments");
+        final List<Map<String, Variant<?>>> attachments = getValue(extras, "attachments");

         return attachments.stream().map(a -> {
             final String file = a.containsKey("file") ? getValue(a, "file") : null;
             return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")
         return attachments.stream().map(a -> {
             final String file = a.containsKey("file") ? getValue(a, "file") : null;
             return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")


@@ -902,6 +1084,44 @@ public class DbusManagerImpl implements Manager {
         }).toList();
     }
 
         }).toList();
     }
 

+    private List<MessageEnvelope.Data.Mention> getMentions(final Map<String, Variant<?>> extras) {
+        if (!extras.containsKey("mentions")) {
+            return List.of();
+        }
+
+        final List<Map<String, Variant<?>>> mentions = getValue(extras, "mentions");
+        return mentions.stream()
+                .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
+                        getValue(a, "start"),
+                        getValue(a, "length")))
+                .toList();
+    }
+
+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+

     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field
     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field