Refactor generateSignedPreKeyRecord

AsamK · Oct 12, 2023 · 527e1ae · 527e1ae
1 parent a66dd0d
commit 527e1ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -148,7 +148,7 @@ private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, Ide
         final var accountData = account.getAccountData(serviceIdType);
         final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
 
-        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair);
+        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
         account.addSignedPreKey(serviceIdType, record);
 
         return record;

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -267,7 +267,7 @@ private PreKeyCollection generatePreKeysForType(ServiceIdType serviceIdType) {
         final var preKeyMetadata = accountData.getPreKeyMetadata();
 
         final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
-        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);
+        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
 
         final var privateKey = keyPair.getPrivateKey();
         final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -61,12 +61,12 @@ var record = new PreKeyRecord(preKeyId, keyPair);
     }
 
     public static SignedPreKeyRecord generateSignedPreKeyRecord(
-            final int signedPreKeyId, final IdentityKeyPair identityKeyPair
+            final int signedPreKeyId, final ECPrivateKey privateKey
     ) {
         var keyPair = Curve.generateKeyPair();
         byte[] signature;
         try {
-            signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
+            signature = Curve.calculateSignature(privateKey, keyPair.getPublicKey().serialize());
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }