From 11d96c894d88ea7cf0da49a23bc12adbc85e33c4 Mon Sep 17 00:00:00 2001 From: Artemii Bigdan Date: Wed, 3 Dec 2025 12:55:42 +0100 Subject: [PATCH] Print user number in UserAlreadyExistsException DBus error Currently, the error looks like "UserAlreadyExistsException null", which does not give enough information to handle this situation in the multi-account daemon mode. This change adds a phone number to the error message resolving my issue and achieving functional parity with CLI interface. --- .../java/org/asamk/signal/dbus/DbusSignalControlImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java index 50150a98..a20789eb 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java @@ -145,7 +145,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { try { final var provisioningManager = c.getProvisioningManagerFor(new URI(deviceLinkUri)); return provisioningManager.finishDeviceLink(newDeviceName); - } catch (TimeoutException | IOException | UserAlreadyExistsException | URISyntaxException e) { + } catch (UserAlreadyExistsException e) { + throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getNumber()); + } catch (TimeoutException | IOException | URISyntaxException e) { throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage()); } }