Update libsignal-service-java

[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 850bcf1d824fb04830f07cb8b2de6a6960d7ea80..b4485e3293bfa7523fbcc181d713e4df8917f851 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -19,6 +19,7 @@ import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;

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

 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupLinkState;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupLinkState;


@@ -53,7 +54,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Objects;
 import java.util.Optional;
 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;
 


@@ -516,7 +516,7 @@ public class DbusSignalImpl implements Signal {
     @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.getSelfNumber()), blocked);
+            m.setContactsBlocked(List.of(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) {


@@ -529,7 +529,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
     @Override
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {

-            m.setGroupBlocked(getGroupId(groupId), blocked);
+            m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);

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


@@ -641,17 +641,14 @@ public class DbusSignalImpl implements Signal {
             return List.of();
         }
 
             return List.of();
         }
 

-        Map<String, Pair<String, UUID>> registered;
+        Map<String, UserStatus> registered;

         try {
         try {

-            registered = m.areUsersRegistered(new HashSet<>(numbers));
+            registered = m.getUserStatus(new HashSet<>(numbers));

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

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

     }
 
     @Override
     }
 
     @Override


@@ -1290,7 +1287,7 @@ public class DbusSignalImpl implements Signal {
 
         private void setIsBlocked(final boolean isBlocked) {
             try {
 
         private void setIsBlocked(final boolean isBlocked) {
             try {

-                m.setGroupBlocked(groupId, isBlocked);
+                m.setGroupsBlocked(List.of(groupId), isBlocked);

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