Implement dbus support for listIdentities

[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 608ed581978d6f9f6be7358fd0f7933b6f851aac..fae0c0a551446a4f7de0d1e362d40fd76086800e 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,7 @@ 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.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 +22,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 +33,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 +63,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,7 +77,7 @@ 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(
             final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
 
     public DbusSignalImpl(
             final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart


@@ -106,6 +109,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 +160,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


@@ -222,19 +228,20 @@ 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,
+                    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();


@@ -349,26 +356,16 @@ public class DbusSignalImpl implements Signal {
     public void sendReadReceipt(
             final String recipient, final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
     public void sendReadReceipt(
             final String recipient, final List<Long> messageIds
     ) 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(
             final String recipient, final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
     }
 
     @Override
     public void sendViewedReceipt(
             final String recipient, final List<Long> messageIds
     ) 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


@@ -391,17 +388,18 @@ 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,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
                     Optional.empty(),
                     attachments,
                     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) {


@@ -436,16 +434,17 @@ 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,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
                     Optional.empty(),
                     attachments,
                     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) {


@@ -530,8 +529,6 @@ public class DbusSignalImpl implements Signal {
             m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
         } catch (NotPrimaryDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
             m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
         } 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.");
         }


@@ -562,6 +559,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);


@@ -575,6 +573,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();


@@ -597,6 +596,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) {


@@ -607,6 +607,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) {


@@ -621,11 +622,16 @@ public class DbusSignalImpl implements Signal {
     public byte[] createGroup(
             final String name, final List<String> members, final String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
     public byte[] createGroup(
             final String name, final List<String> members, final String avatar
     ) 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);


@@ -660,6 +666,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
     }
 
     @Override

+    @Deprecated

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


@@ -667,7 +674,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


@@ -681,6 +688,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();


@@ -776,6 +787,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 {


@@ -815,6 +827,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) {


@@ -825,6 +838,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) {


@@ -893,7 +907,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;
         }
 


@@ -1091,7 +1105,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),


@@ -1166,6 +1180,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());
             }


@@ -1176,7 +1192,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) {


@@ -1232,8 +1248,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.");
             }