Reformat files

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

diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index 3a965e4751caf1b1f59315b02ed393c27158b829..a9e699cc39bfdd114121262152ff68bc90edd556 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -4,21 +4,22 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.UntrustedIdentityException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TypingAction;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 import java.util.HashSet;
 
+import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
+
 public class SendTypingCommand implements JsonRpcLocalCommand {
 
     @Override
@@ -37,15 +38,17 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
-        final var action = ns.getBoolean("stop") ? TypingAction.STOP : TypingAction.START;
+        final var action = Boolean.TRUE.equals(ns.getBoolean("stop")) ? TypingAction.STOP : TypingAction.START;
 
         final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
         if (recipientStrings != null) {
-            final var localNumber = m.getUsername();
+            final var localNumber = m.getSelfNumber();
             recipientIdentifiers.addAll(CommandUtil.getSingleRecipientIdentifiers(recipientStrings, localNumber));
         }
         if (groupIdStrings != null) {
@@ -57,8 +60,9 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
         }
 
         try {
-            m.sendTypingMessage(action, recipientIdentifiers);
-        } catch (IOException | UntrustedIdentityException e) {
+            final var results = m.sendTypingMessage(action, recipientIdentifiers);
+            outputResult(outputWriter, results);
+        } catch (IOException e) {
             throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")");
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {