Prevent preKeyIds from starting at zero

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 87be95b443aa04d202d6e6aff61d5cd1afae4708..bbd9944c1b415fa3d8cd600c96ed2345f58e7d3c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -103,8 +103,8 @@ public class SignalAccount implements Closeable {
     private StorageKey storageKey;
     private long storageManifestVersion = -1;
     private ProfileKey profileKey;
     private StorageKey storageKey;
     private long storageManifestVersion = -1;
     private ProfileKey profileKey;

-    private int preKeyIdOffset;
-    private int nextSignedPreKeyId;
+    private int preKeyIdOffset = 1;
+    private int nextSignedPreKeyId = 1;

     private IdentityKeyPair identityKeyPair;
     private int localRegistrationId;
     private TrustNewIdentity trustNewIdentity;
     private IdentityKeyPair identityKeyPair;
     private int localRegistrationId;
     private TrustNewIdentity trustNewIdentity;


@@ -479,14 +479,14 @@ public class SignalAccount implements Closeable {
             storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
             storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
         }
         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")) {
             try {
         }
         if (rootNode.hasNonNull("profileKey")) {
             try {