Copy managers list to prevent ConcurrentModificationException

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

diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
index 70e2f015adc5f4fa8dd798815ada7081c8be5782..bc2ef37943be68ceeac8dfacc3bb200742025ab1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
@@ -3,14 +3,18 @@ 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.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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

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

 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.CommandUtil;

-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.asamk.signal.util.ErrorUtils;

 
 import java.io.IOException;
 
 import java.io.IOException;

+import java.util.Map;

 
 public class SendReceiptCommand implements JsonRpcLocalCommand {
 
 
 public class SendReceiptCommand implements JsonRpcLocalCommand {
 


@@ -37,21 +41,34 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");

-        final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getUsername());
+        final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());

 
         final var targetTimestamps = ns.<Long>getList("target-timestamp");
         final var type = ns.getString("type");
 
         try {
 
         final var targetTimestamps = ns.<Long>getList("target-timestamp");
         final var type = ns.getString("type");
 
         try {

+            final SendMessageResults results;

             if (type == null || "read".equals(type)) {
             if (type == null || "read".equals(type)) {

-                m.sendReadReceipt(recipient, targetTimestamps);
+                results = m.sendReadReceipt(recipient, targetTimestamps);

             } else if ("viewed".equals(type)) {
             } else if ("viewed".equals(type)) {

-                m.sendViewedReceipt(recipient, targetTimestamps);
+                results = m.sendViewedReceipt(recipient, targetTimestamps);

             } else {
                 throw new UserErrorException("Unknown receipt type: " + type);
             }
             } else {
                 throw new UserErrorException("Unknown receipt type: " + type);
             }

-        } catch (IOException | UntrustedIdentityException e) {
-            throw new UserErrorException("Failed to send message: " + e.getMessage());
+            outputResult(outputWriter, results.timestamp());
+            ErrorUtils.handleSendMessageResults(results.results());
+        } catch (IOException e) {
+            throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")");
+        }
+    }
+
+    private void outputResult(final OutputWriter outputWriter, final long timestamp) {
+        if (outputWriter instanceof PlainTextWriter writer) {
+            writer.println("{}", timestamp);
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            writer.write(Map.of("timestamp", timestamp));

         }
     }
 }
         }
     }
 }