X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..c49b05cd75dd8cee795859b6045fbec0040d4144:/src/main/java/org/asamk/signal/commands/VerifyCommand.java diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java index aca0d700..b6ad100b 100644 --- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java +++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java @@ -2,6 +2,7 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; + import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.internal.push.LockedException; @@ -11,18 +12,12 @@ public class VerifyCommand implements LocalCommand { @Override public void attachToSubparser(final Subparser subparser) { - subparser.addArgument("verificationCode") - .help("The verification code you received via sms or voice call."); - subparser.addArgument("-p", "--pin") - .help("The registration lock PIN, that was set by the user (Optional)"); + subparser.addArgument("verificationCode").help("The verification code you received via sms or voice call."); + subparser.addArgument("-p", "--pin").help("The registration lock PIN, that was set by the user (Optional)"); } @Override public int handleCommand(final Namespace ns, final Manager m) { - if (!m.userHasKeys()) { - System.err.println("User has no keys, first call register."); - return 1; - } if (m.isRegistered()) { System.err.println("User registration is already verified"); return 1; @@ -33,7 +28,8 @@ public class VerifyCommand implements LocalCommand { m.verifyAccount(verificationCode, pin); return 0; } catch (LockedException e) { - System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + (e.getTimeRemaining() / 1000 / 60 / 60)); + System.err.println("Verification failed! This number is locked with a pin. Hours remaining until reset: " + + (e.getTimeRemaining() / 1000 / 60 / 60)); System.err.println("Use '--pin PIN_CODE' to specify the registration lock PIN"); return 3; } catch (IOException e) {