From 5d8d0dcad688c493562f055627158d7300086424 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 10 Aug 2021 15:26:43 +0200 Subject: [PATCH] Implement JsonRpc command for commands without output --- .../java/org/asamk/signal/commands/AddDeviceCommand.java | 2 +- src/main/java/org/asamk/signal/commands/BlockCommand.java | 2 +- .../java/org/asamk/signal/commands/RemoveDeviceCommand.java | 2 +- .../java/org/asamk/signal/commands/RemovePinCommand.java | 2 +- .../java/org/asamk/signal/commands/SendContactsCommand.java | 2 +- .../org/asamk/signal/commands/SendSyncRequestCommand.java | 2 +- .../java/org/asamk/signal/commands/SendTypingCommand.java | 2 +- src/main/java/org/asamk/signal/commands/SetPinCommand.java | 6 +++--- src/main/java/org/asamk/signal/commands/TrustCommand.java | 2 +- src/main/java/org/asamk/signal/commands/UnblockCommand.java | 2 +- .../org/asamk/signal/commands/UpdateAccountCommand.java | 2 +- .../org/asamk/signal/commands/UpdateContactCommand.java | 2 +- .../org/asamk/signal/commands/UpdateProfileCommand.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java index 67ba5b89..31b3c7ef 100644 --- 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 29a1f3e5..7229c2e1 100644 --- 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 a4d4ffea..8295acee 100644 --- 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 b729a9b9..6f335179 100644 --- 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 6abf9c6f..edd5db34 100644 --- 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 9ced5189..4072be15 100644 --- 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 77c1d70c..cb4a4f50 100644 --- 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 6958b16a..3c018cbc 100644 --- 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 eb99386b..62f5190c 100644 --- 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 e4366393..6388aeee 100644 --- 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 ff5aa27e..96b90e41 100644 --- 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 931b2a61..687619b0 100644 --- 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 894b19df..ff9e8996 100644 --- 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) { } -- 2.50.1