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

Add DeviceNotFound Error

Browse source
This commit is contained in:
AsamK 2021-10-09 17:04:01 +02:00
parent cadcc6c8ef
commit b5d4a5000b
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -326,6 +326,13 @@ public interface Signal extends DBusInterface {
}
}
class DeviceNotFound extends DBusExecutionException {
public DeviceNotFound(final String message) {
super(message);
}
}
class GroupNotFound extends DBusExecutionException {
public GroupNotFound(final String message) {

6
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -111,7 +111,11 @@ public class DbusSignalImpl implements Signal {
@Override
public DBusPath getDevice(long deviceId) {
updateDevices();
return new DBusPath(getDeviceObjectPath(objectPath, deviceId));
final var deviceOptional = devices.stream().filter(g -> g.getId().equals(deviceId)).findFirst();
if (deviceOptional.isEmpty()) {
throw new Error.DeviceNotFound("Device not found");
}
return deviceOptional.get().getObjectPath();
}
@Override