X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..9a775171b573089592e82f7c3bf8f5b0fdd7d975:/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 5c7ce403..7cc9daf5 100644 --- a/src/main/java/org/asamk/signal/commands/LinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java @@ -2,8 +2,9 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.UserAlreadyExists; -import org.asamk.signal.manager.Manager; + +import org.asamk.signal.manager.ProvisioningManager; +import org.asamk.signal.manager.UserAlreadyExists; import org.whispersystems.libsignal.InvalidKeyException; import java.io.IOException; @@ -11,24 +12,23 @@ import java.util.concurrent.TimeoutException; import static org.asamk.signal.util.ErrorUtils.handleAssertionError; -public class LinkCommand implements LocalCommand { +public class LinkCommand implements ProvisioningCommand { @Override public void attachToSubparser(final Subparser subparser) { - subparser.addArgument("-n", "--name") - .help("Specify a name to describe this new device."); + subparser.addArgument("-n", "--name").help("Specify a name to describe this new device."); } @Override - public int handleCommand(final Namespace ns, final Manager m) { + public int handleCommand(final Namespace ns, final ProvisioningManager m) { String deviceName = ns.getString("name"); if (deviceName == null) { deviceName = "cli"; } try { System.out.println(m.getDeviceLinkUri()); - m.finishDeviceLink(deviceName); - System.out.println("Associated with: " + m.getUsername()); + String username = m.finishDeviceLink(deviceName); + System.out.println("Associated with: " + username); } catch (TimeoutException e) { System.err.println("Link request timed out, please try again."); return 3; @@ -42,7 +42,11 @@ public class LinkCommand implements LocalCommand { e.printStackTrace(); return 2; } catch (UserAlreadyExists e) { - System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again."); + System.err.println("The user " + + e.getUsername() + + " already exists\nDelete \"" + + e.getFileName() + + "\" before trying again."); return 1; } return 0;