X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..81ee2c2d2bb80660d85cf9d1b7ecdf001983b3d6:/src/main/java/org/asamk/signal/commands/SendCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 23d74165..312ec802 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -22,8 +22,6 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-
 public class SendCommand implements DbusCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
@@ -49,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)) {
@@ -60,16 +58,13 @@ public class SendCommand implements DbusCommand {
         }
         if (!noRecipients && isNoteToSelf) {
             throw new UserErrorException(
-                    "You cannot specify recipients by phone number and not to self at the same time");
+                    "You cannot specify recipients by phone number and note to self at the same time");
         }
 
         if (isEndSession) {
             try {
                 signal.sendEndSessionMessage(recipients);
                 return;
-            } catch (AssertionError e) {
-                handleAssertionError(e);
-                throw e;
             } catch (Signal.Error.UntrustedIdentity e) {
                 throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage());
             } catch (DBusExecutionException e) {
@@ -98,16 +93,13 @@ public class SendCommand implements DbusCommand {
             try {
                 groupId = Util.decodeGroupId(groupIdString).serialize();
             } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id:" + e.getMessage());
+                throw new UserErrorException("Invalid group id: " + e.getMessage());
             }
 
             try {
                 var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
                 writer.println("{}", timestamp);
                 return;
-            } catch (AssertionError e) {
-                handleAssertionError(e);
-                throw e;
             } catch (DBusExecutionException e) {
                 throw new UnexpectedErrorException("Failed to send group message: " + e.getMessage());
             }
@@ -118,9 +110,6 @@ public class SendCommand implements DbusCommand {
                 var timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
                 writer.println("{}", timestamp);
                 return;
-            } catch (AssertionError e) {
-                handleAssertionError(e);
-                throw e;
             } catch (Signal.Error.UntrustedIdentity e) {
                 throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage());
             } catch (DBusExecutionException e) {
@@ -131,9 +120,6 @@ public class SendCommand implements DbusCommand {
         try {
             var timestamp = signal.sendMessage(messageText, attachments, recipients);
             writer.println("{}", timestamp);
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            throw e;
         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.UntrustedIdentity e) {