Remove workaround for getBoolean from JsonRpcLocalCommand

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

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index c39f298db2044c1361ff93b6b8427aaf1d5e9f59..1d6611b58b814214be22b8828d6a0cdf2ba1eda5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -50,23 +50,27 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 

-        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getUsername());
+        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getSelfNumber());

 
         try {
             try {
 
         try {
             try {

-                final var results = m.sendQuitGroupMessage(groupId, groupAdmins);
+                final var results = m.quitGroup(groupId, groupAdmins);

                 final var timestamp = results.getTimestamp();
                 outputResult(outputWriter, timestamp);
                 handleSendMessageResults(results.getResults());
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }
                 final var timestamp = results.getTimestamp();
                 outputResult(outputWriter, timestamp);
                 handleSendMessageResults(results.getResults());
             } 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);
             }
         } catch (IOException e) {
                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }
         } catch (IOException e) {

-            throw new IOErrorException("Failed to send message: " + e.getMessage());
+            throw new IOErrorException("Failed to send message: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         } catch (GroupNotFoundException e) {
             throw new UserErrorException("Failed to send to group: " + e.getMessage());
         } catch (LastGroupAdminException e) {
         } catch (GroupNotFoundException e) {
             throw new UserErrorException("Failed to send to group: " + e.getMessage());
         } catch (LastGroupAdminException e) {