Implement creating V2 Groups

[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 9b6c0d63b331a66ee766d27ffd7684c4f0e7510d..2b9838518adb64ac3c7b140f89fd54acafc4a532 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -3,10 +3,12 @@ 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.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.asamk.signal.manager.Manager;

-import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnection;

 import org.freedesktop.dbus.exceptions.DBusException;
 
 import java.io.IOException;
 import org.freedesktop.dbus.exceptions.DBusException;
 
 import java.io.IOException;


@@ -40,14 +42,14 @@ public class DaemonCommand implements LocalCommand {
         DBusConnection conn = null;
         try {
             try {
         DBusConnection conn = null;
         try {
             try {

-                int busType;
+                DBusConnection.DBusBusType busType;

                 if (ns.getBoolean("system")) {
                 if (ns.getBoolean("system")) {

-                    busType = DBusConnection.SYSTEM;
+                    busType = DBusConnection.DBusBusType.SYSTEM;

                 } else {
                 } else {

-                    busType = DBusConnection.SESSION;
+                    busType = DBusConnection.DBusBusType.SESSION;

                 }
                 conn = DBusConnection.getConnection(busType);
                 }
                 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());