Update libsignal-service-java

[signal-cli] / src / main / java / org / asamk / signal / commands / GetUserStatusCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 4a35fc11c07059a9fff5bc660af2dfe65a0d6aa5..cf4be085cfb9031068da26ff7e3f861a8f3d4be1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -4,46 +4,44 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.JsonWriter;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.JsonWriter;

-import org.asamk.signal.OutputType;

 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.OutputWriter;

-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.PlainTextWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import org.whispersystems.libsignal.util.Pair;

 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;

-import java.util.Set;
+import java.util.UUID;

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

-public class GetUserStatusCommand implements LocalCommand {
+public class GetUserStatusCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
 
     private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);

-    private final OutputWriter outputWriter;

 
 

-    public static void attachToSubparser(final Subparser subparser) {
-        subparser.help("Check if the specified phone number/s have been registered");
-        subparser.addArgument("number").help("Phone number").nargs("+");
-    }
-
-    public GetUserStatusCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
+    @Override
+    public String getName() {
+        return "getUserStatus";

     }
 
     @Override
     }
 
     @Override

-    public Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Check if the specified phone number/s have been registered");
+        subparser.addArgument("recipient").help("Phone number").nargs("+");

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         // Get a map of registration statuses
         // Get a map of registration statuses

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

         try {
         try {

-            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
+            registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));

         } catch (IOException e) {
             logger.debug("Failed to check registered users", e);
             throw new IOErrorException("Unable to check if users are registered");
         } catch (IOException e) {
             logger.debug("Failed to check registered users", e);
             throw new IOErrorException("Unable to check if users are registered");


@@ -53,14 +51,15 @@ public class GetUserStatusCommand implements LocalCommand {
         if (outputWriter instanceof JsonWriter) {
             final var jsonWriter = (JsonWriter) outputWriter;
 
         if (outputWriter instanceof JsonWriter) {
             final var jsonWriter = (JsonWriter) outputWriter;
 

-            var jsonUserStatuses = registered.entrySet()
-                    .stream()
-                    .map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))
-                    .collect(Collectors.toList());
+            var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
+                final var number = entry.getValue().first();
+                final var uuid = entry.getValue().second();
+                return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
+            }).collect(Collectors.toList());

 
             jsonWriter.write(jsonUserStatuses);
         } else {
 
             jsonWriter.write(jsonUserStatuses);
         } else {

-            final var writer = (PlainTextWriterImpl) outputWriter;
+            final var writer = (PlainTextWriter) outputWriter;

 
             for (var entry : registered.entrySet()) {
                 writer.println("{}: {}", entry.getKey(), entry.getValue());
 
             for (var entry : registered.entrySet()) {
                 writer.println("{}: {}", entry.getKey(), entry.getValue());


@@ -70,12 +69,18 @@ public class GetUserStatusCommand implements LocalCommand {
 
     private static final class JsonUserStatus {
 
 
     private static final class JsonUserStatus {
 

-        public String name;
+        public final String recipient;
+
+        public final String number;
+
+        public final String uuid;

 
 

-        public boolean isRegistered;
+        public final boolean isRegistered;

 
 

-        public JsonUserStatus(String name, boolean isRegistered) {
-            this.name = name;
+        public JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) {
+            this.recipient = recipient;
+            this.number = number;
+            this.uuid = uuid;

             this.isRegistered = isRegistered;
         }
     }
             this.isRegistered = isRegistered;
         }
     }