Implement JsonRpc command for commands without output

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

diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 6cb81b7edefa707e61e4f9f3160bd096067fc1d7..1597c4274202ee59c341529ea83505b7a0d8d994 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -4,7 +4,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputWriter;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 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.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;


@@ -17,7 +17,7 @@ import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAc
 
 import java.io.IOException;
 
 
 import java.io.IOException;
 

-import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
+import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;

 
 public class JoinGroupCommand implements LocalCommand {
 
 
 public class JoinGroupCommand implements LocalCommand {
 


@@ -49,7 +49,7 @@ public class JoinGroupCommand implements LocalCommand {
         }
 
         try {
         }
 
         try {

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

 
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
 
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();


@@ -58,7 +58,7 @@ public class JoinGroupCommand implements LocalCommand {
             } else {
                 writer.println("Joined group \"{}\"", newGroupId.toBase64());
             }
             } else {
                 writer.println("Joined group \"{}\"", newGroupId.toBase64());
             }

-            handleTimestampAndSendMessageResults(writer, 0, results.second());
+            handleSendMessageResults(results.second());

         } catch (GroupPatchNotAcceptedException e) {
             throw new UserErrorException("Failed to join group, maybe already a member");
         } catch (IOException e) {
         } catch (GroupPatchNotAcceptedException e) {
             throw new UserErrorException("Failed to join group, maybe already a member");
         } catch (IOException e) {