Add support for sending view once messages

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index a2fd25e0c6fd530d0b6656bf0d056a9255a5d891..725df8b1a639be8b25a6853018ee52586bacadd3 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,6 +4,8 @@ import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;

+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;

 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;


@@ -21,6 +23,7 @@ import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;

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

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


@@ -31,6 +34,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 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.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;

+import org.asamk.signal.util.DateUtils;

 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;


@@ -60,7 +64,7 @@ import java.util.stream.Collectors;
 
 import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
 
 
 import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
 

-public class DbusSignalImpl implements Signal {
+public class DbusSignalImpl implements Signal, AutoCloseable {

 
     private final Manager m;
     private final DBusConnection connection;
 
     private final Manager m;
     private final DBusConnection connection;


@@ -74,10 +78,13 @@ public class DbusSignalImpl implements Signal {
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 

-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);

 
     public DbusSignalImpl(
 
     public DbusSignalImpl(

-            final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
+            final Manager m,
+            DBusConnection connection,
+            final String objectPath,
+            final boolean noReceiveOnStart

     ) {
         this.m = m;
         this.connection = connection;
     ) {
         this.m = m;
         this.connection = connection;


@@ -106,6 +113,7 @@ public class DbusSignalImpl implements Signal {
         updateIdentities();
     }
 
         updateIdentities();
     }
 

+    @Override

     public void close() {
         if (dbusMessageHandler != null) {
             m.removeReceiveHandler(dbusMessageHandler);
     public void close() {
         if (dbusMessageHandler != null) {
             m.removeReceiveHandler(dbusMessageHandler);


@@ -156,8 +164,10 @@ public class DbusSignalImpl implements Signal {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new Error.Failure("Submit challenge error: " + e.getMessage());
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new Error.Failure("Submit challenge error: " + e.getMessage());

+        } catch (CaptchaRejectedException e) {
+            throw new Error.Failure(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");

         }
         }

-

     }
 
     @Override
     }
 
     @Override


@@ -183,8 +193,10 @@ public class DbusSignalImpl implements Signal {
         try {
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
             m.addDeviceLink(deviceLinkUrl);
         try {
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
             m.addDeviceLink(deviceLinkUrl);

-        } catch (IOException | InvalidDeviceLinkException e) {
+        } catch (IOException | InvalidDeviceLinkException | DeviceLimitExceededException e) {

             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());

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

         } catch (URISyntaxException e) {
             throw new Error.InvalidUri(e.getClass().getSimpleName()
                     + " Device link uri has invalid format: "
         } catch (URISyntaxException e) {
             throw new Error.InvalidUri(e.getClass().getSimpleName()
                     + " Device link uri has invalid format: "


@@ -220,19 +232,21 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
+    public long sendMessage(final String messageText, final List<String> attachments, final List<String> recipients) {

         try {
         try {

-            final var results = m.sendMessage(new Message(message,
-                            attachments,
-                            List.of(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            List.of(),
-                            Optional.empty(),
-                            List.of()),
-                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
-                            .map(RecipientIdentifier.class::cast)
-                            .collect(Collectors.toSet()));
+            final var message = new Message(messageText,
+                    attachments,
+                    false,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                    .map(RecipientIdentifier.class::cast)
+                    .collect(Collectors.toSet());
+            final var results = m.sendMessage(message, recipientIdentifiers, false);

 
             checkSendMessageResults(results);
             return results.timestamp();
 
             checkSendMessageResults(results);
             return results.timestamp();


@@ -248,16 +262,12 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final String recipient
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final String recipient) {

         return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
     }
 
     @Override
         return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
     }
 
     @Override

-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final List<String> recipients
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final List<String> recipients) {

         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()


@@ -313,7 +323,9 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendPaymentNotification(
 
     @Override
     public long sendPaymentNotification(

-            final byte[] receipt, final String note, final String recipient
+            final byte[] receipt,
+            final String note,
+            final String recipient

     ) throws Error.Failure {
         try {
             final var results = m.sendPaymentNotificationMessage(receipt,
     ) throws Error.Failure {
         try {
             final var results = m.sendPaymentNotificationMessage(receipt,


@@ -328,7 +340,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendTyping(
 
     @Override
     public void sendTyping(

-            final String recipient, final boolean stop
+            final String recipient,
+            final boolean stop

     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,


@@ -345,28 +358,20 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendReadReceipt(
 
     @Override
     public void sendReadReceipt(

-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds

     ) throws Error.Failure, Error.UntrustedIdentity {
     ) throws Error.Failure, Error.UntrustedIdentity {

-        try {
-            final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);

     }
 
     @Override
     public void sendViewedReceipt(
     }
 
     @Override
     public void sendViewedReceipt(

-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds

     ) throws Error.Failure, Error.UntrustedIdentity {
     ) throws Error.Failure, Error.UntrustedIdentity {

-        try {
-            final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);

     }
 
     @Override
     }
 
     @Override


@@ -389,17 +394,20 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendNoteToSelfMessage(
 
     @Override
     public long sendNoteToSelfMessage(

-            final String message, final List<String> attachments
+            final String messageText,
+            final List<String> attachments

     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {

-            final var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,

                     attachments,
                     attachments,

+                    false,

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

-                    List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+                    List.of());
+            final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false);

             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {


@@ -434,16 +442,18 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

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

         try {
         try {

-            var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,

                     attachments,
                     attachments,

+                    false,

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

-                    List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
+                    List.of());
+            var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);

             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {


@@ -459,7 +469,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendGroupTyping(
 
     @Override
     public void sendGroupTyping(

-            final byte[] groupId, final boolean stop
+            final byte[] groupId,
+            final boolean stop

     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,


@@ -473,9 +484,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public long sendGroupRemoteDeleteMessage(
-            final long targetSentTimestamp, final byte[] groupId
-    ) {
+    public long sendGroupRemoteDeleteMessage(final long targetSentTimestamp, final byte[] groupId) {

         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     Set.of(getGroupRecipientIdentifier(groupId)));
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     Set.of(getGroupRecipientIdentifier(groupId)));


@@ -525,11 +534,9 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void setContactName(final String number, final String name) {
         try {
     @Override
     public void setContactName(final String number, final String name) {
         try {

-            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
+            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "", null, null, null);

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

-        } catch (IOException e) {
-            throw new Error.Failure("Contact is not registered.");

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


@@ -560,6 +567,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
             m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
             m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);


@@ -573,6 +581,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
         return groups.stream().map(g -> g.groupId().serialize()).toList();
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
         return groups.stream().map(g -> g.groupId().serialize()).toList();


@@ -595,6 +604,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null || group.title() == null) {
     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null || group.title() == null) {


@@ -605,6 +615,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public List<String> getGroupMembers(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
     public List<String> getGroupMembers(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {


@@ -617,13 +628,20 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public byte[] createGroup(
 
     @Override
     public byte[] createGroup(

-            final String name, final List<String> members, final String avatar
+            final String name,
+            final List<String> members,
+            final String avatar

     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {

-        return updateGroup(new byte[0], name, members, avatar);
+        return updateGroupInternal(new byte[0], name, members, avatar);

     }
 
     @Override
     }
 
     @Override

+    @Deprecated

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

+        return updateGroupInternal(groupId, name, members, avatar);
+    }
+
+    public byte[] updateGroupInternal(byte[] groupId, String name, List<String> members, String avatar) {

         try {
             groupId = nullIfEmpty(groupId);
             name = nullIfEmpty(name);
         try {
             groupId = nullIfEmpty(groupId);
             name = nullIfEmpty(name);


@@ -658,6 +676,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public boolean isRegistered() {
         return true;
     }
     public boolean isRegistered() {
         return true;
     }


@@ -665,7 +684,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public boolean isRegistered(String number) {
         var result = isRegistered(List.of(number));
     @Override
     public boolean isRegistered(String number) {
         var result = isRegistered(List.of(number));

-        return result.get(0);
+        return result.getFirst();

     }
 
     @Override
     }
 
     @Override


@@ -679,6 +698,10 @@ public class DbusSignalImpl implements Signal {
             registered = m.getUserStatus(new HashSet<>(numbers));
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             registered = m.getUserStatus(new HashSet<>(numbers));
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());

+        } catch (RateLimitException e) {
+            throw new Error.Failure(e.getMessage()
+                    + ", retry at "
+                    + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()));

         }
 
         return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
         }
 
         return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();


@@ -774,6 +797,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {
     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {


@@ -813,6 +837,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public boolean isGroupBlocked(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
     public boolean isGroupBlocked(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {


@@ -823,6 +848,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

     public boolean isMember(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
     public boolean isMember(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {


@@ -883,7 +909,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static void checkGroupSendMessageResults(
     }
 
     private static void checkGroupSendMessageResults(

-            long timestamp, Collection<SendMessageResult> results
+            long timestamp,
+            Collection<SendMessageResult> results

     ) throws DBusExecutionException {
         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.stream().findFirst().get());
     ) throws DBusExecutionException {
         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.stream().findFirst().get());


@@ -891,7 +918,7 @@ public class DbusSignalImpl implements Signal {
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);

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

             return;
         }
 
             return;
         }
 


@@ -910,7 +937,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(

-            final Collection<String> recipientStrings, final String localNumber
+            final Collection<String> recipientStrings,
+            final String localNumber

     ) throws DBusExecutionException {
         final var identifiers = new HashSet<RecipientIdentifier.Single>();
         for (var recipientString : recipientStrings) {
     ) throws DBusExecutionException {
         final var identifiers = new HashSet<RecipientIdentifier.Single>();
         for (var recipientString : recipientStrings) {


@@ -920,7 +948,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static RecipientIdentifier.Single getSingleRecipientIdentifier(
     }
 
     private static RecipientIdentifier.Single getSingleRecipientIdentifier(

-            final String recipientString, final String localNumber
+            final String recipientString,
+            final String localNumber

     ) throws DBusExecutionException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);
     ) throws DBusExecutionException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);


@@ -1030,7 +1059,7 @@ public class DbusSignalImpl implements Signal {
             connection.exportObject(object);
             logger.debug("Exported dbus object: " + object.getObjectPath());
         } catch (DBusException e) {
             connection.exportObject(object);
             logger.debug("Exported dbus object: " + object.getObjectPath());
         } catch (DBusException e) {

-            e.printStackTrace();
+            logger.warn("Failed to export dbus object (" + object.getObjectPath() + "): " + e.getMessage());

         }
     }
 
         }
     }
 


@@ -1089,7 +1118,7 @@ public class DbusSignalImpl implements Signal {
                     List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
                             new DbusProperty<>("Uuid",
                                     () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
                     List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
                             new DbusProperty<>("Uuid",
                                     () -> identity.recipient().uuid().map(UUID::toString).orElse("")),

-                            new DbusProperty<>("Fingerprint", identity::getFingerprint),
+                            new DbusProperty<>("Fingerprint", identity::fingerprint),

                             new DbusProperty<>("SafetyNumber", identity::safetyNumber),
                             new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
                             new DbusProperty<>("TrustLevel", identity::trustLevel),
                             new DbusProperty<>("SafetyNumber", identity::safetyNumber),
                             new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
                             new DbusProperty<>("TrustLevel", identity::trustLevel),


@@ -1098,7 +1127,8 @@ public class DbusSignalImpl implements Signal {
 
         @Override
         public String getObjectPath() {
 
         @Override
         public String getObjectPath() {

-            return getIdentityObjectPath(objectPath, identity.recipient().getLegacyIdentifier());
+            return getIdentityObjectPath(objectPath,
+                    identity.recipient().getLegacyIdentifier() + "_" + identity.recipient().getIdentifier());

         }
 
         @Override
         }
 
         @Override


@@ -1163,6 +1193,8 @@ public class DbusSignalImpl implements Signal {
             try {
                 m.removeLinkedDevices(device.id());
                 updateDevices();
             try {
                 m.removeLinkedDevices(device.id());
                 updateDevices();

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

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


@@ -1173,7 +1205,7 @@ public class DbusSignalImpl implements Signal {
                 throw new Error.Failure("Only the name of this device can be changed");
             }
             try {
                 throw new Error.Failure("Only the name of this device can be changed");
             }
             try {

-                m.updateAccountAttributes(name);
+                m.updateAccountAttributes(name, null, null, null);

                 // update device list
                 updateDevices();
             } catch (IOException e) {
                 // update device list
                 updateDevices();
             } catch (IOException e) {


@@ -1229,8 +1261,6 @@ public class DbusSignalImpl implements Signal {
                         Optional.ofNullable(unidentifiedDeliveryIndicators),
                         Optional.ofNullable(typingIndicators),
                         Optional.ofNullable(linkPreviews)));
                         Optional.ofNullable(unidentifiedDeliveryIndicators),
                         Optional.ofNullable(typingIndicators),
                         Optional.ofNullable(linkPreviews)));

-            } catch (IOException e) {
-                throw new Error.Failure("UpdateAccount error: " + e.getMessage());

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