marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent preKeyIds from starting at zero

Browse Source
This commit is contained in:
AsamK 2022-02-20 10:03:19 +01:00
parent 1ffb6d6907
commit 2c44b65e9f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View File

@ -103,8 +103,8 @@ public class SignalAccount implements Closeable {
private StorageKey storageKey; private StorageKey storageKey;
private long storageManifestVersion = -1; private long storageManifestVersion = -1;
private ProfileKey profileKey; private ProfileKey profileKey;
private int preKeyIdOffset; private int preKeyIdOffset = 1;
private int nextSignedPreKeyId; private int nextSignedPreKeyId = 1;
private IdentityKeyPair identityKeyPair; private IdentityKeyPair identityKeyPair;
private int localRegistrationId; private int localRegistrationId;
private TrustNewIdentity trustNewIdentity; private TrustNewIdentity trustNewIdentity;
@ -479,14 +479,14 @@ public class SignalAccount implements Closeable {
storageManifestVersion = rootNode.get("storageManifestVersion").asLong(); storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
} }
if (rootNode.hasNonNull("preKeyIdOffset")) { if (rootNode.hasNonNull("preKeyIdOffset")) {
preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(0); preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
} else { } else {
preKeyIdOffset = 0; preKeyIdOffset = 1;
} }
if (rootNode.hasNonNull("nextSignedPreKeyId")) { if (rootNode.hasNonNull("nextSignedPreKeyId")) {
nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(); nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
} else { } else {
nextSignedPreKeyId = 0; nextSignedPreKeyId = 1;
} }
if (rootNode.hasNonNull("profileKey")) { if (rootNode.hasNonNull("profileKey")) {
try { try {