From: AsamK <asamk@gmx.de>
Date: Sun, 16 Mar 2025 11:18:59 +0000 (+0100)
Subject: Remove previous prekeys when importing legacy prekeys
X-Git-Tag: v0.13.14~11
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/2b150112ff3ac72b4c715927dc85a4c7e6f41071

Remove previous prekeys when importing legacy prekeys
---

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 ab7c16d8..8d2fbd0f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -827,9 +827,9 @@ public class SignalAccount implements Closeable {
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyPreKeyStore() != null) {
             logger.debug("Migrating legacy pre key store.");
+            aciAccountData.getPreKeyStore().removeAllPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
-                    aciAccountData.getPreKeyStore().removeAllPreKeys();
                     aciAccountData.getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
@@ -839,9 +839,9 @@ public class SignalAccount implements Closeable {
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySignedPreKeyStore() != null) {
             logger.debug("Migrating legacy signed pre key store.");
+            aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
-                    aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
                     aciAccountData.getSignedPreKeyStore()
                             .storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {