X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/357e278f48a6e1b3e3ab58f2ae34053ab1933b96..ca3871e2234614f933dce54abceaef1dd693f698:/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 cd2e188e..88493d3f 100644 --- a/src/main/java/org/asamk/signal/commands/LinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java @@ -6,13 +6,11 @@ import net.sourceforge.argparse4j.inf.Subparser; import org.asamk.signal.PlainTextWriterImpl; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; -import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.ProvisioningManager; import org.asamk.signal.manager.UserAlreadyExists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.whispersystems.libsignal.InvalidKeyException; import java.io.IOException; import java.util.concurrent.TimeoutException; @@ -23,6 +21,7 @@ public class LinkCommand implements ProvisioningCommand { @Override public void attachToSubparser(final Subparser subparser) { + subparser.help("Link to an existing device, instead of registering a new number."); subparser.addArgument("-n", "--name").help("Specify a name to describe this new device."); } @@ -43,9 +42,6 @@ public class LinkCommand implements ProvisioningCommand { throw new UserErrorException("Link request timed out, please try again."); } catch (IOException e) { throw new IOErrorException("Link request error: " + e.getMessage()); - } catch (InvalidKeyException e) { - logger.debug("Finish device link failed", e); - throw new UnexpectedErrorException("Invalid key: " + e.getMessage()); } catch (UserAlreadyExists e) { throw new UserErrorException("The user " + e.getUsername()