Refactor register and verify

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

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 11805b442ca0bd7cc278ecb4a759bae82f0668b7..c5ee2edce8304a8975432437c38186d3eda531c1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -6,6 +6,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;
 
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;

+import org.asamk.signal.dbus.DbusSignalImpl;

 import org.asamk.signal.manager.Manager;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.asamk.signal.manager.Manager;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;


@@ -34,10 +35,6 @@ public class DaemonCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }

         DBusConnection conn = null;
         try {
             try {
         DBusConnection conn = null;
         try {
             try {


@@ -48,7 +45,7 @@ public class DaemonCommand implements LocalCommand {
                     busType = DBusConnection.DBusBusType.SESSION;
                 }
                 conn = DBusConnection.getConnection(busType);
                     busType = DBusConnection.DBusBusType.SESSION;
                 }
                 conn = DBusConnection.getConnection(busType);

-                conn.exportObject(SIGNAL_OBJECTPATH, m);
+                conn.exportObject(SIGNAL_OBJECTPATH, new DbusSignalImpl(m));

                 conn.requestBusName(SIGNAL_BUSNAME);
             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
                 conn.requestBusName(SIGNAL_BUSNAME);
             } catch (UnsatisfiedLinkError e) {
                 System.err.println("Missing native library dependency for dbus service: " + e.getMessage());


@@ -59,7 +56,13 @@ public class DaemonCommand implements LocalCommand {
             }
             boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
             try {
             }
             boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
             try {

-                m.receiveMessages(1, TimeUnit.HOURS, false, ignoreAttachments, ns.getBoolean("json") ? new JsonDbusReceiveMessageHandler(m, conn, SIGNAL_OBJECTPATH) : new DbusReceiveMessageHandler(m, conn, SIGNAL_OBJECTPATH));
+                m.receiveMessages(1,
+                        TimeUnit.HOURS,
+                        false,
+                        ignoreAttachments,
+                        ns.getBoolean("json")
+                                ? new JsonDbusReceiveMessageHandler(m, conn, SIGNAL_OBJECTPATH)
+                                : new DbusReceiveMessageHandler(m, conn, SIGNAL_OBJECTPATH));

                 return 0;
             } catch (IOException e) {
                 System.err.println("Error while receiving messages: " + e.getMessage());
                 return 0;
             } catch (IOException e) {
                 System.err.println("Error while receiving messages: " + e.getMessage());