Refactor dbus client mode to improve maintainability

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 4a478f13398f4ee4218677242ea08154e7ddc5db..1a4fdc10240fb9394aa1f5c15582cd5fc9cb74ba 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -7,6 +7,8 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.StickerPackInvalidException;
 import org.asamk.signal.manager.UntrustedIdentityException;
 import org.asamk.signal.manager.NotMasterDeviceException;
 import org.asamk.signal.manager.StickerPackInvalidException;
 import org.asamk.signal.manager.UntrustedIdentityException;

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

 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TypingAction;


@@ -16,10 +18,11 @@ import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

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

 import org.asamk.signal.util.ErrorUtils;
 import org.asamk.signal.util.ErrorUtils;

-import org.asamk.signal.util.Util;

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

+import org.whispersystems.libsignal.InvalidKeyException;

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


@@ -30,6 +33,8 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

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

 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;


@@ -37,11 +42,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;

+import java.util.UUID;

 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

-import static org.asamk.signal.util.Util.getLegacyIdentifier;
-

 public class DbusSignalImpl implements Signal {
 
     private final Manager m;
 public class DbusSignalImpl implements Signal {
 
     private final Manager m;


@@ -62,6 +66,54 @@ public class DbusSignalImpl implements Signal {
         return objectPath;
     }
 
         return objectPath;
     }
 

+    @Override
+    public String getSelfNumber() {
+        return m.getSelfNumber();
+    }
+
+    @Override
+    public void addDevice(String uri) {
+        try {
+            m.addDeviceLink(new URI(uri));
+        } catch (IOException | InvalidKeyException e) {
+            throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+        } catch (URISyntaxException e) {
+            throw new Error.InvalidUri(e.getClass().getSimpleName()
+                    + " Device link uri has invalid format: "
+                    + e.getMessage());
+        }
+    }
+
+    @Override
+    public void removeDevice(int deviceId) {
+        try {
+            m.removeLinkedDevices(deviceId);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getClass().getSimpleName() + ": Error while removing device: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public List<String> listDevices() {
+        List<Device> devices;
+        try {
+            devices = m.getLinkedDevices();
+        } catch (IOException | Error.Failure e) {
+            throw new Error.Failure("Failed to get linked devices: " + e.getMessage());
+        }
+
+        return devices.stream().map(d -> d.getName() == null ? "" : d.getName()).collect(Collectors.toList());
+    }
+
+    @Override
+    public void updateDeviceName(String deviceName) {
+        try {
+            m.updateAccountAttributes(deviceName);
+        } catch (IOException | Signal.Error.Failure e) {
+            throw new Error.Failure("UpdateAccount error: " + e.getMessage());
+        }
+    }
+

     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
         var recipients = new ArrayList<String>(1);
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
         var recipients = new ArrayList<String>(1);


@@ -73,7 +125,7 @@ public class DbusSignalImpl implements Signal {
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
             final var results = m.sendMessage(new Message(message, attachments),
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
             final var results = m.sendMessage(new Message(message, attachments),

-                    getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
 
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
 


@@ -103,7 +155,7 @@ public class DbusSignalImpl implements Signal {
     ) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
     ) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,

-                    getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.getTimestamp(), results.getResults());
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.getTimestamp(), results.getResults());


@@ -155,9 +207,9 @@ public class DbusSignalImpl implements Signal {
         try {
             final var results = m.sendMessageReaction(emoji,
                     remove,
         try {
             final var results = m.sendMessageReaction(emoji,
                     remove,

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

                     targetSentTimestamp,
                     targetSentTimestamp,

-                    getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.getTimestamp(), results.getResults());
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.getTimestamp(), results.getResults());


@@ -177,7 +229,7 @@ public class DbusSignalImpl implements Signal {
             var recipients = new ArrayList<String>(1);
             recipients.add(recipient);
             m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
             var recipients = new ArrayList<String>(1);
             recipients.add(recipient);
             m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,

-                    getSingleRecipientIdentifiers(recipients, m.getUsername()).stream()
+                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
         } catch (IOException e) {
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
         } catch (IOException e) {


@@ -191,10 +243,10 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendReadReceipt(
 
     @Override
     public void sendReadReceipt(

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

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

-            m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getUsername()), timestamps);
+            m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);

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


@@ -226,7 +278,7 @@ public class DbusSignalImpl implements Signal {
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final var results = m.sendMessage(new Message(message, attachments),
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final var results = m.sendMessage(new Message(message, attachments),

-                    Set.of(new RecipientIdentifier.NoteToSelf()));
+                    Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));

             checkSendMessageResults(results.getTimestamp(), results.getResults());
             return results.getTimestamp();
         } catch (AttachmentInvalidException e) {
             checkSendMessageResults(results.getTimestamp(), results.getResults());
             return results.getTimestamp();
         } catch (AttachmentInvalidException e) {


@@ -241,7 +293,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {
     @Override
     public void sendEndSessionMessage(final List<String> recipients) {
         try {

-            final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getUsername()));
+            final var results = m.sendEndSessionMessage(getSingleRecipientIdentifiers(recipients, m.getSelfNumber()));

             checkSendMessageResults(results.getTimestamp(), results.getResults());
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
             checkSendMessageResults(results.getTimestamp(), results.getResults());
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());


@@ -275,7 +327,7 @@ public class DbusSignalImpl implements Signal {
         try {
             final var results = m.sendMessageReaction(emoji,
                     remove,
         try {
             final var results = m.sendMessageReaction(emoji,
                     remove,

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

                     targetSentTimestamp,
                     Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
             checkSendMessageResults(results.getTimestamp(), results.getResults());
                     targetSentTimestamp,
                     Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
             checkSendMessageResults(results.getTimestamp(), results.getResults());


@@ -291,13 +343,14 @@ public class DbusSignalImpl implements Signal {
     // the profile name
     @Override
     public String getContactName(final String number) {
     // the profile name
     @Override
     public String getContactName(final String number) {

-        return m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getUsername()));
+        final var name = m.getContactOrProfileName(getSingleRecipientIdentifier(number, m.getSelfNumber()));
+        return name == null ? "" : name;

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

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

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


@@ -305,10 +358,19 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

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

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

-            m.setContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()), blocked);
+            m.setContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()), blocked);

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


@@ -340,7 +402,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
     @Override
     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));

-        if (group == null) {
+        if (group == null || group.getTitle() == null) {

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


@@ -353,27 +415,17 @@ public class DbusSignalImpl implements Signal {
         if (group == null) {
             return List.of();
         } else {
         if (group == null) {
             return List.of();
         } else {

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

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

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

             if (groupId == null) {
                 final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
                 checkSendMessageResults(results.second().getTimestamp(), results.second().getResults());
             if (groupId == null) {
                 final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
                 checkSendMessageResults(results.second().getTimestamp(), results.second().getResults());


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

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

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

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

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

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

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

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

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

+    @Override
+    public void updateProfile(
+            final String name,
+            final String about,
+            final String aboutEmoji,
+            String avatarPath,
+            final boolean removeAvatar
+    ) {
+        updateProfile(name, "", about, aboutEmoji, avatarPath, removeAvatar);
+    }
+

     @Override
     public void removePin() {
         try {
     @Override
     public void removePin() {
         try {


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

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

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

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

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


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

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

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

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

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

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

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


@@ -532,7 +626,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public boolean isContactBlocked(final String number) {
 
     @Override
     public boolean isContactBlocked(final String number) {

-        return m.isContactBlocked(getSingleRecipientIdentifier(number, m.getUsername()));
+        return m.isContactBlocked(getSingleRecipientIdentifier(number, m.getSelfNumber()));

     }
 
     @Override
     }
 
     @Override


@@ -551,7 +645,7 @@ public class DbusSignalImpl implements Signal {
         if (group == null) {
             return false;
         } else {
         if (group == null) {
             return false;
         } else {

-            return group.isMember(m.getSelfRecipientId());
+            return group.isMember();

         }
     }
 
         }
     }
 


@@ -657,4 +751,12 @@ public class DbusSignalImpl implements Signal {
             throw new Error.InvalidGroupId("Invalid group id: " + e.getMessage());
         }
     }
             throw new Error.InvalidGroupId("Invalid group id: " + e.getMessage());
         }
     }

+
+    private byte[] nullIfEmpty(final byte[] array) {
+        return array.length == 0 ? null : array;
+    }
+
+    private String nullIfEmpty(final String name) {
+        return name.isEmpty() ? null : name;
+    }

 }
 }