X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9a698929f47d47d5cb63ad74ec4c1196f0cd91df..1ea4309a2ac1e1c368f7ce6a3e1b5dcdf0e0635a:/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 21d43fa5..6c52d59e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -167,7 +167,8 @@ class ManagerImpl implements Manager {
         });
         disposable.add(account.getIdentityKeyStore().getIdentityChanges().subscribe(recipientId -> {
             logger.trace("Archiving old sessions for {}", recipientId);
-            account.getSessionStore().archiveSessions(recipientId);
+            account.getAciSessionStore().archiveSessions(recipientId);
+            account.getPniSessionStore().archiveSessions(recipientId);
             account.getSenderKeyStore().deleteSharedWith(recipientId);
             final var profile = account.getProfileStore().getProfile(recipientId);
             if (profile != null) {
@@ -688,7 +689,7 @@ class ManagerImpl implements Manager {
                 } catch (UnregisteredRecipientException e) {
                     continue;
                 }
-                account.getSessionStore().deleteAllSessions(recipientId);
+                account.getAciSessionStore().deleteAllSessions(recipientId);
             }
         }
     }
@@ -1043,7 +1044,7 @@ class ManagerImpl implements Manager {
                         .computeSafetyNumber(identityInfo.getRecipientId(), identityInfo.getIdentityKey()),
                 scannableFingerprint == null ? null : scannableFingerprint.getSerialized(),
                 identityInfo.getTrustLevel(),
-                identityInfo.getDateAdded());
+                identityInfo.getDateAddedTimestamp());
     }
 
     @Override