fix

[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 4af7156dcd024f82e93217a19ffb49a43432feae..b88aa81e9bedb6087cb5ddd4d059f26a22638d2e 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1,32 +1,44 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;

+import org.asamk.signal.BaseConfig;

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

+import org.asamk.signal.manager.NotMasterDeviceException;

 import org.asamk.signal.manager.groups.GroupId;
 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.GroupNotFoundException;

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

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

-import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.storage.identities.IdentityInfo;

 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.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;

+import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;

 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

+import java.util.Objects;
+import java.util.Set;

 import java.util.stream.Collectors;
 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;

+    private final String objectPath;

 
 

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

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

+        this.objectPath = objectPath;

     }
 
     @Override
     }
 
     @Override


@@ -36,24 +48,24 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public String getObjectPath() {
 
     @Override
     public String getObjectPath() {

-        return null;
+        return objectPath;

     }
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
     }
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {

-        List<String> recipients = new ArrayList<>(1);
+        var recipients = new ArrayList<String>(1);

         recipients.add(recipient);
         return sendMessage(message, attachments, recipients);
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
         recipients.add(recipient);
         return sendMessage(message, attachments, recipients);
     }
 
     private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {

-        String error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
+        var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);

 
         if (error == null) {
             return;
         }
 
 
         if (error == null) {
             return;
         }
 

-        final String message = timestamp + "\nFailed to send message:\n" + error + '\n';
+        final var message = timestamp + "\nFailed to send message:\n" + error + '\n';

 
         if (result.getIdentityFailure() != null) {
             throw new Error.UntrustedIdentity(message);
 
         if (result.getIdentityFailure() != null) {
             throw new Error.UntrustedIdentity(message);


@@ -70,15 +82,15 @@ public class DbusSignalImpl implements Signal {
             return;
         }
 
             return;
         }
 

-        List<String> errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
+        var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);

         if (errors.size() == 0) {
             return;
         }
 
         if (errors.size() == 0) {
             return;
         }
 

-        StringBuilder message = new StringBuilder();
+        var message = new StringBuilder();

         message.append(timestamp).append('\n');
         message.append("Failed to send (some) messages:\n");
         message.append(timestamp).append('\n');
         message.append("Failed to send (some) messages:\n");

-        for (String error : errors) {
+        for (var error : errors) {

             message.append(error).append('\n');
         }
 
             message.append(error).append('\n');
         }
 


@@ -88,7 +100,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {

-            final Pair<Long, List<SendMessageResult>> results = m.sendMessage(message, attachments, recipients);
+            final var results = m.sendMessage(message, attachments, recipients);

             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (InvalidNumberException e) {
             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (InvalidNumberException e) {


@@ -100,12 +112,83 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

+    @Override
+    public long sendRemoteDeleteMessage(
+            final long targetSentTimestamp, final String recipient
+    ) {
+        var recipients = new ArrayList<String>(1);
+        recipients.add(recipient);
+        return sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+    }
+
+    @Override
+    public long sendRemoteDeleteMessage(
+            final long targetSentTimestamp, final List<String> recipients
+    ) {
+        try {
+            final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+            checkSendMessageResults(results.first(), results.second());
+            return results.first();
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        }
+    }
+
+    @Override
+    public long sendGroupRemoteDeleteMessage(
+            final long targetSentTimestamp, final byte[] groupId
+    ) {
+        try {
+            final var results = m.sendGroupRemoteDeleteMessage(targetSentTimestamp, GroupId.unknownVersion(groupId));
+            checkSendMessageResults(results.first(), results.second());
+            return results.first();
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        }
+    }
+
+    @Override
+    public long sendMessageReaction(
+            final String emoji,
+            final boolean remove,
+            final String targetAuthor,
+            final long targetSentTimestamp,
+            final String recipient
+    ) {
+        var recipients = new ArrayList<String>(1);
+        recipients.add(recipient);
+        return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+    }
+
+    @Override
+    public long sendMessageReaction(
+            final String emoji,
+            final boolean remove,
+            final String targetAuthor,
+            final long targetSentTimestamp,
+            final List<String> recipients
+    ) {
+        try {
+            final var results = m.sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+            checkSendMessageResults(results.first(), results.second());
+            return results.first();
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+    }
+

     @Override
     public long sendNoteToSelfMessage(
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
     @Override
     public long sendNoteToSelfMessage(
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {

-            final Pair<Long, SendMessageResult> results = m.sendSelfMessage(message, attachments);
+            final var results = m.sendSelfMessage(message, attachments);

             checkSendMessageResult(results.first(), results.second());
             return results.first();
         } catch (AttachmentInvalidException e) {
             checkSendMessageResult(results.first(), results.second());
             return results.first();
         } catch (AttachmentInvalidException e) {


@@ -118,7 +201,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 Pair<Long, List<SendMessageResult>> results = m.sendEndSessionMessage(recipients);
+            final var results = m.sendEndSessionMessage(recipients);

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


@@ -130,9 +213,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {

-            Pair<Long, List<SendMessageResult>> results = m.sendGroupMessage(message,
-                    attachments,
-                    GroupId.unknownVersion(groupId));
+            var results = m.sendGroupMessage(message, attachments, GroupId.unknownVersion(groupId));

             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {
             checkSendMessageResults(results.first(), results.second());
             return results.first();
         } catch (IOException e) {


@@ -144,10 +225,37 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
         }
     }
 

+    @Override
+    public long sendGroupMessageReaction(
+            final String emoji,
+            final boolean remove,
+            final String targetAuthor,
+            final long targetSentTimestamp,
+            final byte[] groupId
+    ) {
+        try {
+            final var results = m.sendGroupMessageReaction(emoji,
+                    remove,
+                    targetAuthor,
+                    targetSentTimestamp,
+                    GroupId.unknownVersion(groupId));
+            checkSendMessageResults(results.first(), results.second());
+            return results.first();
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        }
+    }
+
+    // Since contact names might be empty if not defined, also potentially return
+    // the profile name

     @Override
     public String getContactName(final String number) {
         try {
     @Override
     public String getContactName(final String number) {
         try {

-            return m.getContactName(number);
+            return m.getContactOrProfileName(number);

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


@@ -159,6 +267,8 @@ public class DbusSignalImpl implements Signal {
             m.setContactName(number, name);
         } catch (InvalidNumberException e) {
             throw new Error.InvalidNumber(e.getMessage());
             m.setContactName(number, name);
         } catch (InvalidNumberException e) {
             throw new Error.InvalidNumber(e.getMessage());

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

         }
     }
 
         }
     }
 


@@ -168,6 +278,8 @@ public class DbusSignalImpl implements Signal {
             m.setContactBlocked(number, blocked);
         } catch (InvalidNumberException e) {
             throw new Error.InvalidNumber(e.getMessage());
             m.setContactBlocked(number, blocked);
         } catch (InvalidNumberException e) {
             throw new Error.InvalidNumber(e.getMessage());

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

         }
     }
 
         }
     }
 


@@ -182,9 +294,9 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<byte[]> getGroupIds() {
 
     @Override
     public List<byte[]> getGroupIds() {

-        List<GroupInfo> groups = m.getGroups();
-        List<byte[]> ids = new ArrayList<>(groups.size());
-        for (GroupInfo group : groups) {
+        var groups = m.getGroups();
+        var ids = new ArrayList<byte[]>(groups.size());
+        for (var group : groups) {

             ids.add(group.getGroupId().serialize());
         }
         return ids;
             ids.add(group.getGroupId().serialize());
         }
         return ids;


@@ -192,7 +304,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public String getGroupName(final byte[] groupId) {
 
     @Override
     public String getGroupName(final byte[] groupId) {

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

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


@@ -202,14 +314,14 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {
 
     @Override
     public List<String> getGroupMembers(final byte[] groupId) {

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

         if (group == null) {
             return List.of();
         } else {
             return group.getMembers()
                     .stream()
                     .map(m::resolveSignalServiceAddress)
         if (group == null) {
             return List.of();
         } else {
             return group.getMembers()
                     .stream()
                     .map(m::resolveSignalServiceAddress)

-                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .map(Util::getLegacyIdentifier)

                     .collect(Collectors.toList());
         }
     }
                     .collect(Collectors.toList());
         }
     }


@@ -229,11 +341,29 @@ public class DbusSignalImpl implements Signal {
             if (avatar.isEmpty()) {
                 avatar = null;
             }
             if (avatar.isEmpty()) {
                 avatar = null;
             }

-            final Pair<GroupId, List<SendMessageResult>> results = m.updateGroup(groupId == null
-                    ? null
-                    : GroupId.unknownVersion(groupId), name, members, avatar == null ? null : new File(avatar));
-            checkSendMessageResults(0, results.second());
-            return results.first().serialize();
+            if (groupId == null) {
+                final var results = m.createGroup(name, members, avatar == null ? null : new File(avatar));
+                checkSendMessageResults(0, results.second());
+                return results.first().serialize();
+            } else {
+                final var results = m.updateGroup(GroupId.unknownVersion(groupId),
+                        name,
+                        null,
+                        members,
+                        null,
+                        null,
+                        null,
+                        false,
+                        null,
+                        null,
+                        null,
+                        avatar == null ? null : new File(avatar),
+                        null);
+                if (results != null) {
+                    checkSendMessageResults(results.first(), results.second());
+                }
+                return groupId;
+            }

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


@@ -265,10 +395,114 @@ public class DbusSignalImpl implements Signal {
             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, about, aboutEmoji, avatarFile);
+            m.setProfile(name, null, about, aboutEmoji, avatarFile);
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+    }
+
+    // Provide option to query a version string in order to react on potential
+    // future interface changes
+    @Override
+    public String version() {
+        return BaseConfig.PROJECT_VERSION;
+    }
+
+    // Create a unique list of Numbers from Identities and Contacts to really get
+    // all numbers the system knows
+    @Override
+    public List<String> listNumbers() {
+        return Stream.concat(m.getIdentities().stream().map(IdentityInfo::getRecipientId),
+                m.getContacts().stream().map(Pair::first))
+                .map(m::resolveSignalServiceAddress)
+                .map(a -> a.getNumber().orNull())
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getContactNumber(final String name) {
+        // Contact names have precedence.
+        var numbers = new ArrayList<String>();
+        var contacts = m.getContacts();
+        for (var c : contacts) {
+            if (name.equals(c.second().getName())) {
+                numbers.add(getLegacyIdentifier(m.resolveSignalServiceAddress(c.first())));
+            }
+        }
+        // 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();
+            if (number != null) {
+                var profile = m.getRecipientProfile(recipientId);
+                if (profile != null && profile.getDisplayName().equals(name)) {
+                    numbers.add(number);
+                }
+            }
+        }
+        return numbers;
+    }
+
+    @Override
+    public void quitGroup(final byte[] groupId) {
+        var group = GroupId.unknownVersion(groupId);
+        try {
+            m.sendQuitGroupMessage(group, Set.of());
+        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        } catch (IOException | LastGroupAdminException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        }
+    }
+
+    @Override
+    public void joinGroup(final String groupLink) {
+        try {
+            final var linkUrl = GroupInviteLinkUrl.fromUri(groupLink);
+            if (linkUrl == null) {
+                throw new Error.Failure("Group link is invalid:");
+            }
+            m.joinGroup(linkUrl);
+        } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupLinkNotActiveException e) {
+            throw new Error.Failure("Group link is invalid: " + e.getMessage());
+        } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
+            throw new Error.Failure("Group link was created with an incompatible version: " + e.getMessage());

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

+    @Override
+    public boolean isContactBlocked(final String number) {
+        try {
+            return m.isContactBlocked(number);
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean isGroupBlocked(final byte[] groupId) {
+        var group = m.getGroup(GroupId.unknownVersion(groupId));
+        if (group == null) {
+            return false;
+        } else {
+            return group.isBlocked();
+        }
+    }
+
+    @Override
+    public boolean isMember(final byte[] groupId) {
+        var group = m.getGroup(GroupId.unknownVersion(groupId));
+        if (group == null) {
+            return false;
+        } else {
+            return group.isMember(m.getSelfRecipientId());
+        }
+    }

 }
 }