Add --voice / -v option for voice call verification

This commit is contained in:
Juraj Bednar 2015-07-05 19:54:03 +02:00 committed by AsamK
parent 9d71313a0c
commit 841519e27a
2 changed files with 12 additions and 4 deletions

View file

@ -17,6 +17,7 @@
package cli;
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.*;
import org.apache.commons.io.IOUtils;
import org.whispersystems.libaxolotl.InvalidVersionException;
@ -45,9 +46,12 @@ public class Main {
.description("valid subcommands")
.help("additional help");
Subparser parserRegister = subparsers.addParser("register");
parserRegister.addArgument("-v", "--voice")
.help("The verification should be done over voice, not sms.")
.action(Arguments.storeTrue());
Subparser parserVerify = subparsers.addParser("verify");
parserVerify.addArgument("verificationCode")
.help("The verification code you received via sms.");
.help("The verification code you received via sms or voice call.");
Subparser parserSend = subparsers.addParser("send");
parserSend.addArgument("recipient")
.help("Specify the recipients' phone number.")
@ -82,7 +86,7 @@ public class Main {
m.createNewIdentity();
}
try {
m.register();
m.register(ns.getBoolean("voice"));
} catch (IOException e) {
System.out.println("Request verify error: " + e.getMessage());
System.exit(3);

View file

@ -117,12 +117,16 @@ public class Manager {
return registered;
}
public void register() throws IOException {
public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18);
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
if (voiceVerication)
accountManager.requestVoiceVerificationCode();
else
accountManager.requestSmsVerificationCode();
registered = false;
}