X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d72b838560b1a4186ac121c7d605773b49fcdf46..d8d859ab0200318faf37ba184ea55871f8d9d2da:/src/main/java/org/asamk/signal/commands/LinkCommand.java diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java index 1d697299..f49e0c24 100644 --- a/src/main/java/org/asamk/signal/commands/LinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.ProvisioningManager; -import org.asamk.signal.manager.UserAlreadyExists; +import org.asamk.signal.manager.api.UserAlreadyExistsException; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,14 +43,13 @@ public class LinkCommand implements ProvisioningCommand { } try { writer.println("{}", m.getDeviceLinkUri()); - try (var manager = m.finishDeviceLink(deviceName)) { - writer.println("Associated with: {}", manager.getSelfNumber()); - } + var number = m.finishDeviceLink(deviceName); + writer.println("Associated with: {}", number); } catch (TimeoutException e) { throw new UserErrorException("Link request timed out, please try again."); } catch (IOException e) { throw new IOErrorException("Link request error: " + e.getMessage(), e); - } catch (UserAlreadyExists e) { + } catch (UserAlreadyExistsException e) { throw new UserErrorException("The user " + e.getNumber() + " already exists\nDelete \""