Remove ThreadStore and store message expiration time in group/contact store

[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 308e564cbd453306b236b0062f63e7018bde8bb1..ab7ca2466633abc2d0a30894c498e1ac62dde438 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -3,6 +3,7 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

+

 import org.asamk.Signal;
 import org.asamk.signal.AttachmentInvalidException;
 import org.asamk.signal.GroupIdFormatException;
 import org.asamk.Signal;
 import org.asamk.signal.AttachmentInvalidException;
 import org.asamk.signal.GroupIdFormatException;


@@ -12,13 +13,21 @@ import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;

+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 

-import static org.asamk.signal.util.ErrorUtils.*;
+import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
+import static org.asamk.signal.util.ErrorUtils.handleDBusExecutionException;
+import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;
+import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
+import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
+import static org.asamk.signal.util.ErrorUtils.handleIOException;
+import static org.asamk.signal.util.ErrorUtils.handleInvalidNumberException;
+import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;

 
 public class SendCommand implements DbusCommand {
 
 
 public class SendCommand implements DbusCommand {
 


@@ -46,7 +55,7 @@ public class SendCommand implements DbusCommand {
             return 1;
         }
 
             return 1;
         }
 

-        if (ns.getList("recipient") == null || ns.getList("recipient").size() == 0) {
+        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (ns.getBoolean("endsession") || ns.getString("group") == null)) {

             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;


@@ -54,7 +63,7 @@ public class SendCommand implements DbusCommand {
 
         if (ns.getBoolean("endsession")) {
             try {
 
         if (ns.getBoolean("endsession")) {
             try {

-                signal.sendEndSessionMessage(ns.<String>getList("recipient"));
+                signal.sendEndSessionMessage(ns.getList("recipient"));

                 return 0;
             } catch (IOException e) {
                 handleIOException(e);
                 return 0;
             } catch (IOException e) {
                 handleIOException(e);


@@ -68,6 +77,9 @@ public class SendCommand implements DbusCommand {
             } catch (DBusExecutionException e) {
                 handleDBusExecutionException(e);
                 return 1;
             } catch (DBusExecutionException e) {
                 handleDBusExecutionException(e);
                 return 1;

+            } catch (InvalidNumberException e) {
+                handleInvalidNumberException(e);
+                return 1;

             }
         }
 
             }
         }
 


@@ -91,7 +103,7 @@ public class SendCommand implements DbusCommand {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 signal.sendGroupMessage(messageText, attachments, groupId);
             } else {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 signal.sendGroupMessage(messageText, attachments, groupId);
             } else {

-                signal.sendMessage(messageText, attachments, ns.<String>getList("recipient"));
+                signal.sendMessage(messageText, attachments, ns.getList("recipient"));

             }
             return 0;
         } catch (IOException e) {
             }
             return 0;
         } catch (IOException e) {


@@ -119,6 +131,9 @@ public class SendCommand implements DbusCommand {
         } catch (GroupIdFormatException e) {
             handleGroupIdFormatException(e);
             return 1;
         } catch (GroupIdFormatException e) {
             handleGroupIdFormatException(e);
             return 1;

+        } catch (InvalidNumberException e) {
+            handleInvalidNumberException(e);
+            return 1;

         }
     }
 }
         }
     }
 }