Reexport dbus objects when self number changes

[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 b32d6633dc0cde3ead2c30a8af0d19db9c46ddfe..5ab237f9da59d1a6ecf93845f111fbb999035c60 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -3,21 +3,20 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.JsonWriter;
-import org.asamk.signal.OutputWriter;
-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.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.util.UUID;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;

-import java.util.stream.Collectors;

 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 


@@ -43,7 +42,11 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         try {
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));
         } catch (IOException e) {
         try {
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));
         } catch (IOException e) {

-            throw new IOErrorException("Unable to check if users are registered", e);
+            throw new IOErrorException("Unable to check if users are registered: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         }
 
         // Output
         }
 
         // Output


@@ -53,7 +56,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
                 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);
                 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());
+            }).toList();

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