Update argparse4j

diff --git a/build.gradle.kts b/build.gradle.kts
index 3ad2c67b55406fc61e73fd29adbd09a005ca636a..70f2a2b4dbc52f7113b8dc06a826d5f4f4abe4fa 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,7 +23,7 @@ repositories {
 
 dependencies {
     implementation("org.bouncycastle:bcprov-jdk15on:1.68")
-    implementation("net.sourceforge.argparse4j:argparse4j:0.8.1")
+    implementation("net.sourceforge.argparse4j:argparse4j:0.9.0")
     implementation("com.github.hypfvieh:dbus-java:3.3.0")
     implementation("org.slf4j:slf4j-simple:1.7.30")
     implementation(project(":lib"))

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 521e453a3e58692c5bc3e092e0e89f42d8330825..54c475b163305a578e7335c7bae8e64b96a3b04a 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -35,6 +35,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
+
 public class App {
 
     private final static Logger logger = LoggerFactory.getLogger(App.class);
@@ -42,7 +44,8 @@ public class App {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {
-        var parser = ArgumentParsers.newFor("signal-cli")
+        var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS)
+                .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
@@ -101,7 +104,7 @@ public class App {
         var username = ns.getString("username");
 
         final var useDbus = ns.getBoolean("dbus");
-        final var useDbusSystem = ns.getBoolean("dbus_system");
+        final var useDbusSystem = ns.getBoolean("dbus-system");
         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
             initDbusClient(command, username, useDbusSystem);
@@ -116,7 +119,7 @@ public class App {
             dataPath = getDefaultDataPath();
         }
 
-        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service_environment");
+        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
         final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
                 ? ServiceEnvironment.LIVE
                 : ServiceEnvironment.SANDBOX;

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 8d26e452c984658c3dbedbc383e9b1a69547f7ec..f54f3bf67b03488427926a08a3a006fe844aa415 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -54,7 +54,7 @@ public class DaemonCommand implements MultiLocalCommand {
             logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
         }
 
-        boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
+        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;
         if (ns.getBoolean("system")) {
@@ -88,7 +88,7 @@ public class DaemonCommand implements MultiLocalCommand {
             logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
         }
 
-        boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
+        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
 
         DBusConnection.DBusBusType busType;
         if (ns.getBoolean("system")) {

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index f3f77347b490c9ef20cb6f501453d8e39131eee0..47f9aa842c161a8e36817d5a8d7e215dcce331e6 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -155,7 +155,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             returnOnTimeout = false;
             timeout = 3600;
         }
-        boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
+        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
         try {
             final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
             m.receiveMessages((long) (timeout * 1000),

diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 793b362a9521e7a13888307ae681bb1dd4d8019b..8efd581bd6de287db202b4904fc9f86049dbc175 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -41,7 +41,7 @@ public class RemoteDeleteCommand implements DbusCommand {
             throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
         }
 
-        final long targetTimestamp = ns.getLong("target_timestamp");
+        final long targetTimestamp = ns.getLong("target-timestamp");
 
         final var writer = new PlainTextWriterImpl(System.out);
 

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 3c4ccb77fe6994367a9c5ca7b251894f7759b9c4..312ec802c8dd91cd35d9eb2ee2301cca3a6ac7b2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -47,7 +47,7 @@ public class SendCommand implements DbusCommand {
         final List<String> recipients = ns.getList("recipient");
         final var isEndSession = ns.getBoolean("endsession");
         final var groupIdString = ns.getString("group");
-        final var isNoteToSelf = ns.getBoolean("note_to_self");
+        final var isNoteToSelf = ns.getBoolean("note-to-self");
 
         final var noRecipients = recipients == null || recipients.isEmpty();
         if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) {

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index f610e81b973098f252f0454b2fc36842bf01d2ed..44286acb8d8bdc40f0275087a3b175b00beb0b10 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -51,8 +51,8 @@ public class SendReactionCommand implements DbusCommand {
 
         final var emoji = ns.getString("emoji");
         final boolean isRemove = ns.getBoolean("remove");
-        final var targetAuthor = ns.getString("target_author");
-        final long targetTimestamp = ns.getLong("target_timestamp");
+        final var targetAuthor = ns.getString("target-author");
+        final long targetTimestamp = ns.getLong("target-timestamp");
 
         final var writer = new PlainTextWriterImpl(System.out);
 

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 00371b59e0378620b1daa21eed229d95201f032e..d6debf86d4feb22522c5a5c85df9c3cfb82624b6 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -28,7 +28,7 @@ public class TrustCommand implements LocalCommand {
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         var number = ns.getString("number");
-        if (ns.getBoolean("trust_all_known_keys")) {
+        if (ns.getBoolean("trust-all-known-keys")) {
             boolean res;
             try {
                 res = m.trustIdentityAllKeys(number);
@@ -39,7 +39,7 @@ public class TrustCommand implements LocalCommand {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
             }
         } else {
-            var safetyNumber = ns.getString("verified_safety_number");
+            var safetyNumber = ns.getString("verified-safety-number");
             if (safetyNumber != null) {
                 safetyNumber = safetyNumber.replaceAll(" ", "");
                 if (safetyNumber.length() == 66) {

diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
index 72df842e34b69a3fa05b4e7ff1ef2320e3805c85..d6d27e2824c2d6290d602decbd057068bf17daef 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -23,7 +23,7 @@ public class UnregisterCommand implements LocalCommand {
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         try {
-            if (ns.getBoolean("delete_account")) {
+            if (ns.getBoolean("delete-account")) {
                 m.deleteAccount();
             } else {
                 m.unregister();

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index ce578f27837221b1e1da5c8d1ad38e002e943c64..c2712adba5f939058458c3d93e2a6328fb574564 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -30,12 +30,12 @@ public class UpdateProfileCommand implements LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        var givenName = ns.getString("given_name");
-        var familyName = ns.getString("family_name");
+        var givenName = ns.getString("given-name");
+        var familyName = ns.getString("family-name");
         var about = ns.getString("about");
-        var aboutEmoji = ns.getString("about_emoji");
+        var aboutEmoji = ns.getString("about-emoji");
         var avatarPath = ns.getString("avatar");
-        boolean removeAvatar = ns.getBoolean("remove_avatar");
+        boolean removeAvatar = ns.getBoolean("remove-avatar");
 
         Optional<File> avatarFile = removeAvatar
                 ? Optional.absent()