Include unrestricted unidentified access state in getUserStatus response

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index df21d94d61722ad6c8767ad02e324dc256b62c07..05ba6b9983d943a2f3d5bf3df496b849e8683483 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -2,10 +2,8 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.DbusConfig;
 
 import org.asamk.Signal;
 import org.asamk.signal.DbusConfig;

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

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

-import org.asamk.signal.manager.NotMasterDeviceException;
-import org.asamk.signal.manager.StickerPackInvalidException;
+import org.asamk.signal.manager.api.AttachmentInvalidException;

 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;


@@ -14,12 +12,17 @@ import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;

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

 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;

+import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackInvalidException;
+import org.asamk.signal.manager.api.StickerPackUrl;

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


@@ -42,15 +45,16 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;

+import java.time.Duration;

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

+import java.util.Objects;

 import java.util.Optional;
 import java.util.Set;
 import java.util.Optional;
 import java.util.Set;

-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;

 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;


@@ -83,19 +87,16 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void checkAccountState() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Map<String, Pair<String, UUID>> areUsersRegistered(final Set<String> numbers) throws IOException {
+    public Map<String, UserStatus> getUserStatus(final Set<String> numbers) throws IOException {

         final var numbersList = new ArrayList<>(numbers);
         final var registered = signal.isRegistered(numbersList);
 
         final var numbersList = new ArrayList<>(numbers);
         final var registered = signal.isRegistered(numbersList);
 

-        final var result = new HashMap<String, Pair<String, UUID>>();
+        final var result = new HashMap<String, UserStatus>();

         for (var i = 0; i < numbersList.size(); i++) {
             result.put(numbersList.get(i),
         for (var i = 0; i < numbersList.size(); i++) {
             result.put(numbersList.get(i),

-                    new Pair<>(numbersList.get(i), registered.get(i) ? RecipientAddress.UNKNOWN_UUID : null));
+                    new UserStatus(numbersList.get(i),
+                            registered.get(i) ? RecipientAddress.UNKNOWN_UUID : null,
+                            false));

         }
         return result;
     }
         }
         return result;
     }


@@ -171,7 +172,7 @@ public class DbusManagerImpl implements Manager {
         return signal.listDevices().stream().map(d -> {
             final var device = getRemoteObject(d.getObjectPath(),
                     Signal.Device.class).GetAll("org.asamk.Signal.Device");
         return signal.listDevices().stream().map(d -> {
             final var device = getRemoteObject(d.getObjectPath(),
                     Signal.Device.class).GetAll("org.asamk.Signal.Device");

-            return new Device((long) device.get("Id").getValue(),
+            return new Device((Integer) device.get("Id").getValue(),

                     (String) device.get("Name").getValue(),
                     (long) device.get("Created").getValue(),
                     (long) device.get("LastSeen").getValue(),
                     (String) device.get("Name").getValue(),
                     (long) device.get("Created").getValue(),
                     (long) device.get("LastSeen").getValue(),


@@ -180,7 +181,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void removeLinkedDevices(final long deviceId) throws IOException {
+    public void removeLinkedDevices(final int deviceId) throws IOException {

         final var devicePath = signal.getDevice(deviceId);
         getRemoteObject(devicePath, Signal.Device.class).removeDevice();
     }
         final var devicePath = signal.getDevice(deviceId);
         getRemoteObject(devicePath, Signal.Device.class).removeDevice();
     }


@@ -392,12 +393,12 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void deleteRecipient(final RecipientIdentifier.Single recipient) throws IOException {
+    public void deleteRecipient(final RecipientIdentifier.Single recipient) {

         signal.deleteRecipient(recipient.getIdentifier());
     }
 
     @Override
         signal.deleteRecipient(recipient.getIdentifier());
     }
 
     @Override

-    public void deleteContact(final RecipientIdentifier.Single recipient) throws IOException {
+    public void deleteContact(final RecipientIdentifier.Single recipient) {

         signal.deleteContact(recipient.getIdentifier());
     }
 
         signal.deleteContact(recipient.getIdentifier());
     }
 


@@ -435,14 +436,19 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public URI uploadStickerPack(final File path) throws IOException, StickerPackInvalidException {
+    public StickerPackUrl uploadStickerPack(final File path) throws IOException, StickerPackInvalidException {

         try {
         try {

-            return new URI(signal.uploadStickerPack(path.getPath()));
-        } catch (URISyntaxException e) {
+            return StickerPackUrl.fromUri(new URI(signal.uploadStickerPack(path.getPath())));
+        } catch (URISyntaxException | StickerPackUrl.InvalidStickerPackLinkException e) {

             throw new AssertionError(e);
         }
     }
 
             throw new AssertionError(e);
         }
     }
 

+    @Override
+    public List<StickerPack> getStickerPacks() {
+        throw new UnsupportedOperationException();
+    }
+

     @Override
     public void requestAllSyncData() throws IOException {
         signal.sendSyncRequest();
     @Override
     public void requestAllSyncData() throws IOException {
         signal.sendSyncRequest();


@@ -494,14 +500,26 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void receiveMessages(
 
     @Override
     public void receiveMessages(

-            final long timeout, final TimeUnit unit, final ReceiveMessageHandler handler
+            final Duration timeout, final ReceiveMessageHandler handler

     ) throws IOException {
     ) throws IOException {

-        addReceiveHandler(handler);
-        try {
-            Thread.sleep(unit.toMillis(timeout));
-        } catch (InterruptedException ignored) {
+        final var lastMessage = new AtomicLong(System.currentTimeMillis());
+
+        final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
+            lastMessage.set(System.currentTimeMillis());
+            handler.handleMessage(envelope, e);
+        };
+        addReceiveHandler(receiveHandler);
+        while (true) {
+            try {
+                final var sleepTimeRemaining = timeout.toMillis() - (System.currentTimeMillis() - lastMessage.get());
+                if (sleepTimeRemaining < 0) {
+                    break;
+                }
+                Thread.sleep(sleepTimeRemaining);
+            } catch (InterruptedException ignored) {
+            }

         }
         }

-        removeReceiveHandler(handler);
+        removeReceiveHandler(receiveHandler);

     }
 
     @Override
     }
 
     @Override


@@ -525,7 +543,14 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public List<Pair<RecipientAddress, Contact>> getContacts() {
 
     @Override
     public List<Pair<RecipientAddress, Contact>> getContacts() {

-        throw new UnsupportedOperationException();
+        return signal.listNumbers().stream().map(n -> {
+            final var contactName = signal.getContactName(n);
+            if (contactName.length() == 0) {
+                return null;
+            }
+            return new Pair<>(new RecipientAddress(null, n),
+                    new Contact(contactName, null, 0, signal.isContactBlocked(n), false));
+        }).filter(Objects::nonNull).toList();

     }
 
     @Override
     }
 
     @Override


@@ -560,6 +585,9 @@ public class DbusManagerImpl implements Manager {
                     ((List<String>) group.get("Admins").getValue()).stream()
                             .map(m -> new RecipientAddress(null, m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()
                             .map(m -> new RecipientAddress(null, m))
                             .collect(Collectors.toSet()),

+                    ((List<String>) group.get("Banned").getValue()).stream()
+                            .map(m -> new RecipientAddress(null, m))
+                            .collect(Collectors.toSet()),

                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
                     GroupPermission.valueOf((String) group.get("PermissionAddMember").getValue()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
                     GroupPermission.valueOf((String) group.get("PermissionAddMember").getValue()),


@@ -606,6 +634,10 @@ public class DbusManagerImpl implements Manager {
         throw new UnsupportedOperationException();
     }
 
         throw new UnsupportedOperationException();
     }
 

+    @Override
+    public void addAddressChangedListener(final Runnable listener) {
+    }
+

     @Override
     public void addClosedListener(final Runnable listener) {
         synchronized (closedListeners) {
     @Override
     public void addClosedListener(final Runnable listener) {
         synchronized (closedListeners) {


@@ -614,7 +646,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void close() throws IOException {
+    public void close() {

         synchronized (this) {
             this.notify();
         }
         synchronized (this) {
             this.notify();
         }


@@ -665,9 +697,9 @@ public class DbusManagerImpl implements Manager {
         return string == null ? "" : string;
     }
 
         return string == null ? "" : string;
     }
 

-    private <T extends DBusInterface> T getRemoteObject(final DBusPath devicePath, final Class<T> type) {
+    private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {

         try {
         try {

-            return connection.getRemoteObject(DbusConfig.getBusname(), devicePath.getPath(), type);
+            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);

         } catch (DBusException e) {
             throw new AssertionError(e);
         }
         } catch (DBusException e) {
             throw new AssertionError(e);
         }


@@ -756,7 +788,7 @@ public class DbusManagerImpl implements Manager {
                                         ? Optional.empty()
                                         : Optional.of(new RecipientAddress(null, syncReceived.getDestination())),
                                 Set.of(),
                                         ? Optional.empty()
                                         : Optional.of(new RecipientAddress(null, syncReceived.getDestination())),
                                 Set.of(),

-                                new MessageEnvelope.Data(syncReceived.getTimestamp(),
+                                Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),

                                         syncReceived.getGroupId().length > 0
                                                 ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
                                                 syncReceived.getGroupId()), false, 0))
                                         syncReceived.getGroupId().length > 0
                                                 ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
                                                 syncReceived.getGroupId()), false, 0))


@@ -776,7 +808,7 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),

-                                        List.of()))),
+                                        List.of())))),

                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),