X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/0624d6a808b8b2a247aadd96450319bc94e3729f..d4b4bd86038025ec69e95c9994e30077d1c9d241:/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 8b694cb6..447cbb03 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -7,6 +7,7 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; +import org.asamk.signal.OutputType; import org.asamk.signal.manager.Manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,7 @@ public class GetUserStatusCommand implements LocalCommand { ObjectMapper jsonProcessor = new ObjectMapper(); jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); - boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json"); + boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json"); // TODO delete later when "json" variable is removed if (ns.getBoolean("json")) { @@ -50,7 +51,7 @@ public class GetUserStatusCommand implements LocalCommand { registered = m.areUsersRegistered(new HashSet<>(ns.getList("number"))); } catch (IOException e) { System.err.println("Unable to check if users are registered"); - return 1; + return 3; } // Output