Fix JsonRpcLocalCommand interface

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

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 4a208f82b434cef66b2525cc7795b60de0ccda46..6388aeee86acf3f648c3198e6defbc0b93fa690d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -3,6 +3,7 @@ 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;


@@ -14,15 +15,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 

-public class UnblockCommand implements LocalCommand {
+public class UnblockCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("contact").help("Contact number").nargs("*");
-        subparser.addArgument("-g", "--group").help("Group ID").nargs("*");
+    public UnblockCommand(final OutputWriter outputWriter) {
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {

         subparser.help("Unblock the given contacts or groups (messages will be received again)");
         subparser.help("Unblock the given contacts or groups (messages will be received again)");

+        subparser.addArgument("contact").help("Contact number").nargs("*");
+        subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*");

     }
 
     @Override
     }
 
     @Override


@@ -37,8 +40,8 @@ public class UnblockCommand implements LocalCommand {
             }
         }
 
             }
         }
 

-        if (ns.<String>getList("group") != null) {
-            for (var groupIdString : ns.<String>getList("group")) {
+        if (ns.<String>getList("group-id") != null) {
+            for (var groupIdString : ns.<String>getList("group-id")) {

                 try {
                     var groupId = Util.decodeGroupId(groupIdString);
                     m.setGroupBlocked(groupId, false);
                 try {
                     var groupId = Util.decodeGroupId(groupIdString);
                     m.setGroupBlocked(groupId, false);