Prevent updateContact and block commands on linked devices

[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 6b22029b2fc0434f05c0465f383116aabc5a6f6e..879e602816c80ff9afcd6becad4f1bc78139806a 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,12 +4,15 @@ 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.BaseConfig;
 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.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 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.NotAGroupMemberException;

+import org.asamk.signal.manager.storage.identities.IdentityInfo;

 import org.asamk.signal.util.ErrorUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.util.ErrorUtils;
 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.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;


@@ -144,7 +147,11 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendMessageReaction(
 
     @Override
     public long sendMessageReaction(

-            final String emoji, final boolean remove, final String targetAuthor, final long targetSentTimestamp, final String recipient
+            final String emoji,
+            final boolean remove,
+            final String targetAuthor,
+            final long targetSentTimestamp,
+            final String recipient

     ) {
         var recipients = new ArrayList<String>(1);
         recipients.add(recipient);
     ) {
         var recipients = new ArrayList<String>(1);
         recipients.add(recipient);


@@ -153,7 +160,11 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendMessageReaction(
 
     @Override
     public long sendMessageReaction(

-            final String emoji, final boolean remove, final String targetAuthor, final long targetSentTimestamp, final List<String> recipients
+            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);
     ) {
         try {
             final var results = m.sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);


@@ -210,10 +221,18 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendGroupMessageReaction(
 
     @Override
     public long sendGroupMessageReaction(

-            final String emoji, final boolean remove, final String targetAuthor, final long targetSentTimestamp, final byte[] groupId
+            final String emoji,
+            final boolean remove,
+            final String targetAuthor,
+            final long targetSentTimestamp,
+            final byte[] groupId

     ) {
         try {
     ) {
         try {

-            final var results = m.sendGroupMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, GroupId.unknownVersion(groupId));
+            final var results = m.sendGroupMessageReaction(emoji,
+                    remove,
+                    targetAuthor,
+                    targetSentTimestamp,
+                    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) {


@@ -231,7 +250,7 @@ public class DbusSignalImpl implements Signal {
     public String getContactName(final String number) {
         try {
             return m.getContactOrProfileName(number);
     public String getContactName(final String number) {
         try {
             return m.getContactOrProfileName(number);

-        } catch (Exception e) {
+        } catch (InvalidNumberException e) {

             throw new Error.InvalidNumber(e.getMessage());
         }
     }
             throw new Error.InvalidNumber(e.getMessage());
         }
     }


@@ -242,6 +261,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.");

         }
     }
 
         }
     }
 


@@ -251,6 +272,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.");

         }
     }
 
         }
     }
 


@@ -366,8 +389,10 @@ 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(i -> i.getAddress().getNumber().orNull()),
-                m.getContacts().stream().map(c -> c.number))
+        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());
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.toList());


@@ -379,13 +404,14 @@ public class DbusSignalImpl implements Signal {
         var numbers = new ArrayList<String>();
         var contacts = m.getContacts();
         for (var c : contacts) {
         var numbers = new ArrayList<String>();
         var contacts = m.getContacts();
         for (var c : contacts) {

-            if (c.name != null && c.name.equals(name)) {
-                numbers.add(c.number);
+            if (name.equals(c.second().getName())) {
+                numbers.add(m.resolveSignalServiceAddress(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 address = identity.getAddress();
+            final var recipientId = identity.getRecipientId();
+            final var address = m.resolveSignalServiceAddress(recipientId);

             var number = address.getNumber().orNull();
             if (number != null) {
                 var profile = m.getRecipientProfile(address);
             var number = address.getNumber().orNull();
             if (number != null) {
                 var profile = m.getRecipientProfile(address);


@@ -428,13 +454,11 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public boolean isContactBlocked(final String number) {
 
     @Override
     public boolean isContactBlocked(final String number) {

-        var contacts = m.getContacts();
-        for (var c : contacts) {
-            if (c.number.equals(number)) {
-                return c.blocked;
-            }
+        try {
+            return m.isContactBlocked(number);
+        } catch (InvalidNumberException e) {
+            throw new Error.InvalidNumber(e.getMessage());

         }
         }

-        return false;

     }
 
     @Override
     }
 
     @Override


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

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

         }
     }
 }
         }
     }
 }