Extract lib module

[signal-cli] / 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 a4bdc89b01e3fc2c14714ba36b03338c5a5f22a4..73d8f2ed35b8346575a419765a4e718e7de86482 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;

+import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 


@@ -8,11 +9,11 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;

+import org.freedesktop.dbus.errors.UnknownObject;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

-import java.util.ArrayList;

 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;


@@ -22,8 +23,13 @@ public class SendCommand implements DbusCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");

         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");

+        final MutuallyExclusiveGroup mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
+        mutuallyExclusiveGroup.addArgument("-g", "--group").help("Specify the recipient group ID.");
+        mutuallyExclusiveGroup.addArgument("--note-to-self")
+                .help("Send the message to self without notification.")
+                .action(Arguments.storeTrue());
+

         subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used.");
         subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
         subparser.addArgument("-e", "--endsession")
         subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used.");
         subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
         subparser.addArgument("-e", "--endsession")


@@ -33,24 +39,39 @@ public class SendCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {

-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (
-                ns.getBoolean("endsession") || ns.getString("group") == null
-        )) {
+        final List<String> recipients = ns.getList("recipient");
+        final Boolean isEndSession = ns.getBoolean("endsession");
+        final String groupIdString = ns.getString("group");
+        final Boolean isNoteToSelf = ns.getBoolean("note_to_self");
+
+        final boolean noRecipients = recipients == null || recipients.isEmpty();
+        if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) {

             System.err.println("No recipients given");
             System.err.println("Aborting sending.");
             return 1;
         }
             System.err.println("No recipients given");
             System.err.println("Aborting sending.");
             return 1;
         }

+        if (!noRecipients && groupIdString != null) {
+            System.err.println("You cannot specify recipients by phone number and groups at the same time");
+            return 1;
+        }
+        if (!noRecipients && isNoteToSelf) {
+            System.err.println("You cannot specify recipients by phone number and not to self at the same time");
+            return 1;
+        }

 
 

-        if (ns.getBoolean("endsession")) {
+        if (isEndSession) {

             try {
             try {

-                signal.sendEndSessionMessage(ns.getList("recipient"));
+                signal.sendEndSessionMessage(recipients);

                 return 0;
             } catch (AssertionError e) {
                 handleAssertionError(e);
                 return 1;
                 return 0;
             } catch (AssertionError e) {
                 handleAssertionError(e);
                 return 1;

+            } catch (Signal.Error.UntrustedIdentity e) {
+                System.err.println("Failed to send message: " + e.getMessage());
+                return 4;

             } catch (DBusExecutionException e) {
                 System.err.println("Failed to send message: " + e.getMessage());
             } catch (DBusExecutionException e) {
                 System.err.println("Failed to send message: " + e.getMessage());

-                return 1;
+                return 2;

             }
         }
 
             }
         }
 


@@ -67,14 +88,14 @@ public class SendCommand implements DbusCommand {
 
         List<String> attachments = ns.getList("attachment");
         if (attachments == null) {
 
         List<String> attachments = ns.getList("attachment");
         if (attachments == null) {

-            attachments = new ArrayList<>();
+            attachments = List.of();

         }
 
         }
 

-        try {
-            if (ns.getString("group") != null) {
+        if (groupIdString != null) {
+            try {

                 byte[] groupId;
                 try {
                 byte[] groupId;
                 try {

-                    groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+                    groupId = Util.decodeGroupId(groupIdString).serialize();

                 } catch (GroupIdFormatException e) {
                     handleGroupIdFormatException(e);
                     return 1;
                 } catch (GroupIdFormatException e) {
                     handleGroupIdFormatException(e);
                     return 1;


@@ -83,25 +104,48 @@ public class SendCommand implements DbusCommand {
                 long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
                 System.out.println(timestamp);
                 return 0;
                 long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
                 System.out.println(timestamp);
                 return 0;

+            } catch (AssertionError e) {
+                handleAssertionError(e);
+                return 1;
+            } catch (DBusExecutionException e) {
+                System.err.println("Failed to send group message: " + e.getMessage());
+                return 2;
+            }
+        }
+
+        if (isNoteToSelf) {
+            try {
+                long timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
+                System.out.println(timestamp);
+                return 0;
+            } catch (AssertionError e) {
+                handleAssertionError(e);
+                return 1;
+            } catch (Signal.Error.UntrustedIdentity e) {
+                System.err.println("Failed to send message: " + e.getMessage());
+                return 4;
+            } catch (DBusExecutionException e) {
+                System.err.println("Failed to send note to self message: " + e.getMessage());
+                return 2;

             }
             }

-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
-        } catch (DBusExecutionException e) {
-            System.err.println("Failed to send message: " + e.getMessage());
-            return 1;

         }
 
         try {
         }
 
         try {

-            long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
+            long timestamp = signal.sendMessage(messageText, attachments, recipients);

             System.out.println(timestamp);
             return 0;
         } catch (AssertionError e) {
             handleAssertionError(e);
             return 1;
             System.out.println(timestamp);
             return 0;
         } catch (AssertionError e) {
             handleAssertionError(e);
             return 1;

+        } catch (UnknownObject e) {
+            System.err.println("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
+            return 1;
+        } catch (Signal.Error.UntrustedIdentity e) {
+            System.err.println("Failed to send message: " + e.getMessage());
+            return 4;

         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());

-            return 1;
+            return 2;

         }
     }
 }
         }
     }
 }