X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2935b96070ee687c7a17382c64e3f85730b9f706..a96bd91770880fc53e279f8a0a75e90cd32d078a:/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index aad731a0..9c1eecce 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -40,6 +40,7 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 import java.util.Locale;
 
 public class RegistrationManager implements Closeable {
@@ -163,11 +164,11 @@ public class RegistrationManager implements Closeable {
         account.setRegistered(true);
         account.setUuid(UuidUtil.parseOrNull(response.getUuid()));
         account.setRegistrationLockPin(pin);
-        account.getSignalProtocolStore().archiveAllSessions();
-        account.getSignalProtocolStore()
-                .saveIdentity(account.getSelfAddress(),
-                        account.getSignalProtocolStore().getIdentityKeyPair().getPublicKey(),
-                        TrustLevel.TRUSTED_VERIFIED);
+        account.getSessionStore().archiveAllSessions();
+        final var recipientId = account.getRecipientStore().resolveRecipient(account.getSelfAddress());
+        final var publicKey = account.getIdentityKeyPair().getPublicKey();
+        account.getIdentityKeyStore().saveIdentity(recipientId, publicKey, new Date());
+        account.getIdentityKeyStore().setIdentityTrustLevel(recipientId, publicKey, TrustLevel.TRUSTED_VERIFIED);
 
         Manager m = null;
         try {
@@ -194,7 +195,7 @@ public class RegistrationManager implements Closeable {
     ) throws IOException {
         return accountManager.verifyAccountWithCode(verificationCode,
                 null,
-                account.getSignalProtocolStore().getLocalRegistrationId(),
+                account.getLocalRegistrationId(),
                 true,
                 legacyPin,
                 registrationLock,