Implement JsonRpc command for commands without output

diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 67ba5b89d8518a111b49a9c2f9435a9dda487f37..31b3c7ef66671215e2017cc2d32a16e39da7a2ff 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -17,7 +17,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-public class AddDeviceCommand implements LocalCommand {
+public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
 

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 29a1f3e53e5284f95df7f1de2338b109c35f5db8..7229c2e1b89ae21a7f40ac8fbb0195666d67bd1e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -15,7 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
-public class BlockCommand implements LocalCommand {
+public class BlockCommand implements JsonRpcLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 

diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index a4d4ffeae60cb708335089155f943aa97e76eac5..8295acee4eda8d0054bb381279048cd7f9f1ebdb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -10,7 +10,7 @@ import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 
-public class RemoveDeviceCommand implements LocalCommand {
+public class RemoveDeviceCommand implements JsonRpcLocalCommand {
 
     public RemoveDeviceCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index b729a9b99b9867e8165c275c3356d69dbc7484b0..6f335179da5e17fb48cba5aded4b09cb699365b3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -13,7 +13,7 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.IOException;
 
-public class RemovePinCommand implements LocalCommand {
+public class RemovePinCommand implements JsonRpcLocalCommand {
 
     public RemovePinCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index 6abf9c6f3bcf38e5f445f2446fb32823a1239315..edd5db34680b1690c6ef7570ac2917a082f20790 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -12,7 +12,7 @@ import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 
 import java.io.IOException;
 
-public class SendContactsCommand implements LocalCommand {
+public class SendContactsCommand implements JsonRpcLocalCommand {
 
     public SendContactsCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
index 9ced51890d03f94c8b0a187e7b6259508053f657..4072be15feca44163d180fc9d0be5387bc6d632d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
@@ -10,7 +10,7 @@ import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 
-public class SendSyncRequestCommand implements LocalCommand {
+public class SendSyncRequestCommand implements JsonRpcLocalCommand {
 
     public SendSyncRequestCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index 77c1d70cda802f2ace240d9c7af5501112035546..cb4a4f50c4994c43a1923b22b1202add4fcb4f62 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -20,7 +20,7 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import java.io.IOException;
 import java.util.HashSet;
 
-public class SendTypingCommand implements LocalCommand {
+public class SendTypingCommand implements JsonRpcLocalCommand {
 
     public SendTypingCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index 6958b16ad2cd91c6e31223816ad77c0c43423256..3c018cbc7db206d95ab10b933674d69c326130ca 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -13,21 +13,21 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 
 import java.io.IOException;
 
-public class SetPinCommand implements LocalCommand {
+public class SetPinCommand implements JsonRpcLocalCommand {
 
     public SetPinCommand(final OutputWriter outputWriter) {
     }
 
     public static void attachToSubparser(final Subparser subparser) {
         subparser.help("Set a registration lock pin, to prevent others from registering this number.");
-        subparser.addArgument("registrationLockPin")
+        subparser.addArgument("pin")
                 .help("The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         try {
-            var registrationLockPin = ns.getString("registrationLockPin");
+            var registrationLockPin = ns.getString("pin");
             m.setRegistrationLockPin(Optional.of(registrationLockPin));
         } catch (UnauthenticatedResponseException e) {
             throw new UnexpectedErrorException("Set pin error failed with unauthenticated response: " + e.getMessage());

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index eb99386b3d6ee48ea564244b3148652fa1ad4f1b..62f5190c7eeddd0f0e62c3adfebae75528df6c31 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -13,7 +13,7 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.util.Locale;
 
-public class TrustCommand implements LocalCommand {
+public class TrustCommand implements JsonRpcLocalCommand {
 
     public TrustCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index e4366393cb5e84b40e6897a9ae4c1fc0ecc2aa68..6388aeee86acf3f648c3198e6defbc0b93fa690d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -15,7 +15,7 @@ import org.slf4j.Logger;
 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);
 

diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index ff5aa27eae0a079d1cb5539cabe6e7d485265ea9..96b90e4181b45cc8cd0a23fe70b8d91a0c0c0e80 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -10,7 +10,7 @@ import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 
-public class UpdateAccountCommand implements LocalCommand {
+public class UpdateAccountCommand implements JsonRpcLocalCommand {
 
     public UpdateAccountCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 931b2a612a62f5b171dc316b2415d67466aba2a2..687619b02c777539d0aff475ea4fb6c565f524dd 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -13,7 +13,7 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
-public class UpdateContactCommand implements LocalCommand {
+public class UpdateContactCommand implements JsonRpcLocalCommand {
 
     public UpdateContactCommand(final OutputWriter outputWriter) {
     }

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index 894b19dfc8ed56710720ec9852533de4bde5f0b4..ff9e899688d2dce8cbced8c9295fc184e9134dbd 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -13,7 +13,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.io.File;
 import java.io.IOException;
 
-public class UpdateProfileCommand implements LocalCommand {
+public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
     public UpdateProfileCommand(final OutputWriter outputWriter) {
     }