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

Refresh prekeys if there are less than 20 left on the server

Browse source
This commit is contained in:
AsamK 2016-03-27 16:15:49 +02:00
parent 95278a95ce
commit 900b648f09
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,9 @@ class Manager implements Signal {
public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion(); public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION; private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION;
private final static int PREKEY_MINIMUM_COUNT = 20;
private static final int PREKEY_BATCH_SIZE = 100;
private final String settingsPath; private final String settingsPath;
private final String dataPath; private final String dataPath;
private final String attachmentsPath; private final String attachmentsPath;
@ -140,6 +143,10 @@ class Manager implements Signal {
groupStore = new JsonGroupStore(); groupStore = new JsonGroupStore();
} }
accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT); accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
if (accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
save();
}
} }
private void save() { private void save() {
@ -187,12 +194,10 @@ class Manager implements Signal {
save(); save();
} }
private static final int BATCH_SIZE = 100;
private List<PreKeyRecord> generatePreKeys() { private List<PreKeyRecord> generatePreKeys() {
List<PreKeyRecord> records = new LinkedList<>(); List<PreKeyRecord> records = new LinkedList<>();
for (int i = 0; i < BATCH_SIZE; i++) { for (int i = 0; i < PREKEY_BATCH_SIZE; i++) {
int preKeyId = (preKeyIdOffset + i) % Medium.MAX_VALUE; int preKeyId = (preKeyIdOffset + i) % Medium.MAX_VALUE;
ECKeyPair keyPair = Curve.generateKeyPair(); ECKeyPair keyPair = Curve.generateKeyPair();
PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair); PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
@ -201,13 +206,13 @@ class Manager implements Signal {
records.add(record); records.add(record);
} }
preKeyIdOffset = (preKeyIdOffset + BATCH_SIZE + 1) % Medium.MAX_VALUE; preKeyIdOffset = (preKeyIdOffset + PREKEY_BATCH_SIZE + 1) % Medium.MAX_VALUE;
save(); save();
return records; return records;
} }
private PreKeyRecord generateLastResortPreKey() { private PreKeyRecord getOrGenerateLastResortPreKey() {
if (signalProtocolStore.containsPreKey(Medium.MAX_VALUE)) { if (signalProtocolStore.containsPreKey(Medium.MAX_VALUE)) {
try { try {
return signalProtocolStore.loadPreKey(Medium.MAX_VALUE); return signalProtocolStore.loadPreKey(Medium.MAX_VALUE);
@ -249,14 +254,16 @@ class Manager implements Signal {
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID))); //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true; registered = true;
refreshPreKeys();
save();
}
private void refreshPreKeys() throws IOException {
List<PreKeyRecord> oneTimePreKeys = generatePreKeys(); List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
PreKeyRecord lastResortKey = getOrGenerateLastResortPreKey();
PreKeyRecord lastResortKey = generateLastResortPreKey();
SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair()); SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());
accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys); accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
save();
} }