Refactor Manager and SignalAccount to implement Closeable

[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 85fee723874c2d22b7ac05dbcdf11531175ea56d..11805b442ca0bd7cc278ecb4a759bae82f0668b7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,7 +7,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.DbusReceiveMessageHandler;
 import org.asamk.signal.JsonDbusReceiveMessageHandler;
 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;


@@ -41,11 +41,11 @@ 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.exportObject(SIGNAL_OBJECTPATH, m);
                 }
                 conn = DBusConnection.getConnection(busType);
                 conn.exportObject(SIGNAL_OBJECTPATH, m);