webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support registration lock PIN

Browse source
This commit is contained in:
AsamK 2018-03-31 23:41:58 +02:00
parent 161ecc877d
commit e057743232
3 changed files with 69 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/org/asamk/signal/Manager.java
View file

@ -116,6 +116,7 @@ class Manager implements Signal {
private String username;
private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
private String password;
private String registrationLockPin;
private String signalingKey;
private int preKeyIdOffset;
private int nextSignedPreKeyId;
@ -258,6 +259,8 @@ class Manager implements Signal {
}
username = getNotNullNode(rootNode, "username").asText();
password = getNotNullNode(rootNode, "password").asText();
JsonNode pinNode = rootNode.get("registrationLockPin");
registrationLockPin = pinNode == null ? null : pinNode.asText();
if (rootNode.has("signalingKey")) {
signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
}
@ -326,6 +329,7 @@ class Manager implements Signal {
rootNode.put("username", username)
.put("deviceId", deviceId)
.put("password", password)
.put("registrationLockPin", registrationLockPin)
.put("signalingKey", signalingKey)
.put("preKeyIdOffset", preKeyIdOffset)
.put("nextSignedPreKeyId", nextSignedPreKeyId)
@ -374,7 +378,7 @@ class Manager implements Signal {
}
public void updateAccountAttributes() throws IOException {
accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), true);
accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), true, registrationLockPin);
}
public void unregister() throws IOException {
@ -504,18 +508,28 @@ class Manager implements Signal {
}
}
public void verifyAccount(String verificationCode) throws IOException {
public void verifyAccount(String verificationCode, String pin) throws IOException {
verificationCode = verificationCode.replace("-", "");
signalingKey = Util.getSecret(52);
accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), true);
accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), true, pin);
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
registrationLockPin = pin;
refreshPreKeys();
save();
}
public void setRegistrationLockPin(Optional<String> pin) throws IOException {
accountManager.setPin(pin);
if (pin.isPresent()) {
registrationLockPin = pin.get();
} else {
registrationLockPin = null;
}
}
private void refreshPreKeys() throws IOException {
List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());