Remove workaround for getBoolean from JsonRpcLocalCommand

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index bffbded51128d28893e57bb41c308ceb5b107a74..c44c737c3385648dae21eb8d2c1a260670fcdc00 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -117,8 +117,8 @@ public class App {
 
         var username = ns.getString("username");
 
 
         var username = ns.getString("username");
 

-        final var useDbus = ns.getBoolean("dbus");
-        final var useDbusSystem = ns.getBoolean("dbus-system");
+        final var useDbus = Boolean.TRUE.equals(ns.getBoolean("dbus"));
+        final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));

         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
             initDbusClient(command, username, useDbusSystem, outputWriter);
         if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
             initDbusClient(command, username, useDbusSystem, outputWriter);

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 26079ec6c2f8622be8081c76257bc632fef4f37e..2a95e6de1b4bc287e574a6fc94f794dafa279cf3 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -80,7 +80,7 @@ public class Main {
             return false;
         }
 
             return false;
         }
 

-        return ns.getBoolean("verbose");
+        return Boolean.TRUE.equals(ns.getBoolean("verbose"));

     }
 
     private static void configureLogging(final boolean verbose) {
     }
 
     private static void configureLogging(final boolean verbose) {

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 9878de1595a5bd338ecb904ac27063cd51392114..5045db9a28c89fce326bdfe780c9c479ba3c7ea8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -54,10 +54,10 @@ public class DaemonCommand implements MultiLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
+        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

 
         DBusConnection.DBusBusType busType;
 
         DBusConnection.DBusBusType busType;

-        if (ns.getBoolean("system")) {
+        if (Boolean.TRUE.equals(ns.getBoolean("system"))) {

             busType = DBusConnection.DBusBusType.SYSTEM;
         } else {
             busType = DBusConnection.DBusBusType.SESSION;
             busType = DBusConnection.DBusBusType.SYSTEM;
         } else {
             busType = DBusConnection.DBusBusType.SESSION;


@@ -83,10 +83,10 @@ public class DaemonCommand implements MultiLocalCommand {
     public void handleCommand(
             final Namespace ns, final List<Manager> managers, final SignalCreator c, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final List<Manager> managers, final SignalCreator c, final OutputWriter outputWriter
     ) throws CommandException {

-        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
+        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

 
         DBusConnection.DBusBusType busType;
 
         DBusConnection.DBusBusType busType;

-        if (ns.getBoolean("system")) {
+        if (Boolean.TRUE.equals(ns.getBoolean("system"))) {

             busType = DBusConnection.DBusBusType.SYSTEM;
         } else {
             busType = DBusConnection.DBusBusType.SESSION;
             busType = DBusConnection.DBusBusType.SYSTEM;
         } else {
             busType = DBusConnection.DBusBusType.SESSION;

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index d0e4dfec353325954d640e20457c968e8a8c470f..9af67322197ab1335574b66226463b2445d67941 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -65,7 +65,7 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        final boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
+        final boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

 
         final var objectMapper = Util.createJsonObjectMapper();
         final var jsonRpcSender = new JsonRpcSender((JsonWriter) outputWriter);
 
         final var objectMapper = Util.createJsonObjectMapper();
         final var jsonRpcSender = new JsonRpcSender((JsonWriter) outputWriter);

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index 24b45ee83f21d68d6e5ad89ecbfeed42df31353d..5b926732710b183bb32205a617b97684d835edbb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -64,14 +64,5 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
 
             return super.getList(dest + "s");
         }
 
             return super.getList(dest + "s");
         }

-
-        @Override
-        public Boolean getBoolean(String dest) {
-            Boolean maybeGotten = this.get(dest);
-            if (maybeGotten == null) {
-                maybeGotten = false;
-            }
-            return maybeGotten;
-        }

     }
 }
     }
 }

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 1eda53ced47f7f76c6955511143edbc4e4a5c9d7..fd8c4b92141bdeb838276c25aa16a31fc82e63dd 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -102,7 +102,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             jsonWriter.write(jsonGroups);
         } else {
             final var writer = (PlainTextWriter) outputWriter;
             jsonWriter.write(jsonGroups);
         } else {
             final var writer = (PlainTextWriter) outputWriter;

-            boolean detailed = ns.getBoolean("detailed");
+            boolean detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));

             for (var group : groups) {
                 printGroupPlainText(writer, group, detailed);
             }
             for (var group : groups) {
                 printGroupPlainText(writer, group, detailed);
             }

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index 7635f8ae44dc516618ea0073a1224c8af2f5aa4f..1d6611b58b814214be22b8828d6a0cdf2ba1eda5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -61,7 +61,7 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }

-            if (ns.getBoolean("delete")) {
+            if (Boolean.TRUE.equals(ns.getBoolean("delete"))) {

                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }
                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 62b3164bfbf7968fee5c07cf2fee0b13a48fab1c..4686f26dbcabecc409898ecf56d29fb060badaa9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -147,7 +147,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             returnOnTimeout = false;
             timeout = 3600;
         }
             returnOnTimeout = false;
             timeout = 3600;
         }

-        boolean ignoreAttachments = ns.getBoolean("ignore-attachments");
+        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));

         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);

diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 96530889a10f902b87bfc156af18b68621a5e27c..af6c06ad3916ce6e756f6ebdbc131e66a5d1dc8c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -31,7 +31,7 @@ public class RegisterCommand implements RegistrationCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {

-        final boolean voiceVerification = ns.getBoolean("voice");
+        final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));

         final var captchaString = ns.getString("captcha");
         final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");
 
         final var captchaString = ns.getString("captcha");
         final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");
 

diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index e515defefa4d05ab037faad4ac91bb06de8acc94..c9eab95ca57d5ab06f01b9e5fd7c7aace92135f2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -43,7 +43,7 @@ public class RemoteDeleteCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        final var isNoteToSelf = ns.getBoolean("note-to-self");
+        final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));

         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 1cd2e674ba8e5395089982bab13bdf58bfc48a01..dba7689f2fbad2a2e8b5600db8399d41d35bc025 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -58,7 +58,7 @@ public class SendCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        final var isNoteToSelf = ns.getBoolean("note-to-self");
+        final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));

         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 


@@ -67,7 +67,7 @@ public class SendCommand implements JsonRpcLocalCommand {
                 recipientStrings,
                 groupIdStrings);
 
                 recipientStrings,
                 groupIdStrings);
 

-        final var isEndSession = ns.getBoolean("end-session");
+        final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session"));

         if (isEndSession) {
             final var singleRecipients = recipientIdentifiers.stream()
                     .filter(r -> r instanceof RecipientIdentifier.Single)
         if (isEndSession) {
             final var singleRecipients = recipientIdentifiers.stream()
                     .filter(r -> r instanceof RecipientIdentifier.Single)

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index a1c6c31989c12ab1db1c2cafa27929f57622a112..857f603dc2f3f7bea794ca3e409a820550201adb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -52,7 +52,7 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        final var isNoteToSelf = ns.getBoolean("note-to-self");
+        final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));

         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 


@@ -62,7 +62,7 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
                 groupIdStrings);
 
         final var emoji = ns.getString("emoji");
                 groupIdStrings);
 
         final var emoji = ns.getString("emoji");

-        final var isRemove = ns.getBoolean("remove");
+        final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));

         final var targetAuthor = ns.getString("target-author");
         final var targetTimestamp = ns.getLong("target-timestamp");
 
         final var targetAuthor = ns.getString("target-author");
         final var targetTimestamp = ns.getLong("target-timestamp");
 

diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index cfe66770877aaca367b1c3a3d9b899e842ca688f..ba062b70ed8b470c1bbf630292133553c9efd31c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -41,7 +41,7 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");

-        final var action = ns.getBoolean("stop") ? TypingAction.STOP : TypingAction.START;
+        final var action = Boolean.TRUE.equals(ns.getBoolean("stop")) ? TypingAction.STOP : TypingAction.START;

 
         final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
         if (recipientStrings != null) {
 
         final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
         if (recipientStrings != null) {

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 9e59ad86ce34734cd4ef74ca13d47b5969713817..77fcc08a7f7054e8445fc0032842c990774c6935 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -39,7 +39,7 @@ public class TrustCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
     ) throws CommandException {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());

-        if (ns.getBoolean("trust-all-known-keys")) {
+        if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {

             boolean res = m.trustIdentityAllKeys(recipient);
             if (!res) {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
             boolean res = m.trustIdentityAllKeys(recipient);
             if (!res) {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");

diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
index 6026004611c3cde3d2d047576f2b2fbfe779edcf..68a203752bd4edc56bfac19f778b586dabe4b927 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -31,7 +31,7 @@ public class UnregisterCommand implements LocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         try {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         try {

-            if (ns.getBoolean("delete-account")) {
+            if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {

                 m.deleteAccount();
             } else {
                 m.unregister();
                 m.deleteAccount();
             } else {
                 m.unregister();

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 4bbaa992b4e7938c7a470925454f4d44301167e6..68bce2d222a0a3756e3b4635aad57517cc5554c9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -121,7 +121,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
         var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
         var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);
         var groupAvatar = ns.getString("avatar");
         var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
         var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);
         var groupAvatar = ns.getString("avatar");

-        var groupResetLink = ns.getBoolean("reset-link");
+        var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link"));

         var groupLinkState = getGroupLinkState(ns.getString("link"));
         var groupExpiration = ns.getInt("expiration");
         var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member"));
         var groupLinkState = getGroupLinkState(ns.getString("link"));
         var groupExpiration = ns.getInt("expiration");
         var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member"));

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index f6dcb30eaa4d212ec01a5c61c4024e3639ad6a4a..9890a597c573fd8a23e0a950497f12c03eb1a410 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -42,7 +42,7 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
         var about = ns.getString("about");
         var aboutEmoji = ns.getString("about-emoji");
         var avatarPath = ns.getString("avatar");
         var about = ns.getString("about");
         var aboutEmoji = ns.getString("about-emoji");
         var avatarPath = ns.getString("avatar");

-        boolean removeAvatar = ns.getBoolean("remove-avatar");
+        boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));

 
         Optional<File> avatarFile = removeAvatar
                 ? Optional.absent()
 
         Optional<File> avatarFile = removeAvatar
                 ? Optional.absent()