Update systemd service file

[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 ee51dd916326ab4f8f5ad1fe3923b2f81de358c2..235fc53cb4638125586362badf0034342ae20680 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -8,6 +8,7 @@ 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.freedesktop.dbus.errors.UnknownObject;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
@@ -33,11 +34,6 @@ public class SendCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
         if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (
                 ns.getBoolean("endsession") || ns.getString("group") == null
         )) {
@@ -55,7 +51,7 @@ public class SendCommand implements DbusCommand {
                 return 1;
             } catch (DBusExecutionException e) {
                 System.err.println("Failed to send message: " + e.getMessage());
-                return 1;
+                return 2;
             }
         }
 
@@ -94,7 +90,7 @@ public class SendCommand implements DbusCommand {
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            return 2;
         }
 
         try {
@@ -104,9 +100,12 @@ public class SendCommand implements DbusCommand {
         } 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 (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            return 2;
         }
     }
 }