webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return struct instead of object path directly for dbus list devices

Browse source
This commit is contained in:
AsamK 2021-10-07 20:51:33 +02:00
parent 7829a8d631
commit c56a8df9b2
3 changed files with 77 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/org/asamk/Signal.java
View file

@ -3,7 +3,9 @@ package org.asamk;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.Struct;
import org.freedesktop.dbus.annotations.DBusProperty;
import org.freedesktop.dbus.annotations.Position;
import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.freedesktop.dbus.interfaces.DBusInterface;
@ -104,7 +106,7 @@ public interface Signal extends DBusInterface {
DBusPath getDevice(long deviceId);
List<DBusPath> listDevices() throws Error.Failure;
List<StructDevice> listDevices() throws Error.Failure;
DBusPath getThisDevice();
@ -262,6 +264,36 @@ public interface Signal extends DBusInterface {
}
}
class StructDevice extends Struct {
@Position(0)
DBusPath objectPath;
@Position(1)
Long id;
@Position(2)
String name;
public StructDevice(final DBusPath objectPath, final Long id, final String name) {
this.objectPath = objectPath;
this.id = id;
this.name = name;
}
public DBusPath getObjectPath() {
return objectPath;
}
public Long getId() {
return id;
}
public String getName() {
return name;
}
}
@DBusProperty(name = "Id", type = Long.class, access = DBusProperty.Access.READ)
@DBusProperty(name = "Name", type = String.class)
@DBusProperty(name = "Created", type = String.class, access = DBusProperty.Access.READ)