From f70507ca24dcb27d8b15e701303377117c1c5a18 Mon Sep 17 00:00:00 2001 From: John Freed Date: Thu, 12 Aug 2021 09:10:13 +0200 Subject: [PATCH] modify DBus SignalControl remove listAccounts() from methods available to DBus clients, because it returns a list of "DBusPath" objects, which DBus itself cannot handle add getObjectPath, because it is already implemented in DbusSignalControlImpl.java --- src/main/java/org/asamk/SignalControl.java | 4 ++-- .../java/org/asamk/signal/dbus/DbusSignalControlImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/asamk/SignalControl.java b/src/main/java/org/asamk/SignalControl.java index 911ccb61..e4636171 100644 --- a/src/main/java/org/asamk/SignalControl.java +++ b/src/main/java/org/asamk/SignalControl.java @@ -26,9 +26,9 @@ public interface SignalControl extends DBusInterface { String link(String newDeviceName) throws Error.Failure; - public String version(); + String version(); - List listAccounts(); + String getObjectPath(); interface Error { diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java index 35f530b0..ff6bfc09 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java @@ -150,7 +150,6 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { return BaseConfig.PROJECT_VERSION; } - @Override public List listAccounts() { synchronized (receiveThreads) { return receiveThreads.stream()