webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-01 20:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5b5f3679b9 into 27c08a56fe

Browse source
This commit is contained in:
Juraj Bednar 2015-07-05 21:50:54 +00:00
commit 82637fb148
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/cli/Main.java
View file

@ -17,6 +17,7 @@
package cli; package cli;
import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.*; import net.sourceforge.argparse4j.inf.*;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.whispersystems.libaxolotl.InvalidVersionException; import org.whispersystems.libaxolotl.InvalidVersionException;
@ -43,9 +44,12 @@ public class Main {
.description("valid subcommands") .description("valid subcommands")
.help("additional help"); .help("additional help");
Subparser parserRegister = subparsers.addParser("register"); 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"); Subparser parserVerify = subparsers.addParser("verify");
parserVerify.addArgument("verificationCode") 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"); Subparser parserSend = subparsers.addParser("send");
parserSend.addArgument("recipient") parserSend.addArgument("recipient")
.help("Specify the recipients' phone number.") .help("Specify the recipients' phone number.")
@ -80,7 +84,7 @@ public class Main {
m.createNewIdentity(); m.createNewIdentity();
} }
try { try {
m.register(); m.register(ns.getBoolean("voice"));
} catch (IOException e) { } catch (IOException e) {
System.out.println("Request verify error: " + e.getMessage()); System.out.println("Request verify error: " + e.getMessage());
System.exit(3); System.exit(3);

10
src/main/java/cli/Manager.java
View file

@ -115,18 +115,22 @@ public class Manager {
return registered; return registered;
} }
public void register() throws IOException { public void register(boolean voiceVerication) throws IOException {
password = Util.getSecret(18); password = Util.getSecret(18);
signalingKey = Util.getSecret(52);
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);
accountManager.requestSmsVerificationCode(); if (voiceVerication)
accountManager.requestVoiceVerificationCode();
else
accountManager.requestSmsVerificationCode();
registered = false; registered = false;
} }
public void verifyAccount(String verificationCode) throws IOException { public void verifyAccount(String verificationCode) throws IOException {
verificationCode = verificationCode.replace("-", ""); verificationCode = verificationCode.replace("-", "");
signalingKey = Util.getSecret(52);
accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId()); accountManager.verifyAccount(verificationCode, signalingKey, false, axolotlStore.getLocalRegistrationId());
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID))); //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));