Delete migrated stores after closing the input stream

Fixes #1018

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 29b30ffd14f13478e197fce80e9e9ec7de44d13a..0c05e0c055de2216448bfd57fcac737d2d51d6ee 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -84,13 +84,18 @@ public class LegacyRecipientStore2 {
             }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
 
             recipientStore.addLegacyRecipients(recipients);
-            Files.delete(file.toPath());
         } catch (FileNotFoundException e) {
             // nothing to migrate
         } catch (IOException e) {
             logger.warn("Failed to load recipient store", e);
             throw new RuntimeException(e);
         }
+        try {
+            Files.delete(file.toPath());
+        } catch (IOException e) {
+            logger.warn("Failed to load recipient store", e);
+            throw new RuntimeException(e);
+        }
     }
 
     private record Storage(List<Recipient> recipients, long lastId) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
index 47465b3e4ff7cae86b7e36db9ca88f9c8b7bd6bf..dfbc2ff99cd41fa01c35cb9bcca470af9b9bd84f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -52,6 +52,10 @@ public class LegacySenderKeySharedStore {
             }
 
             senderKeyStore.addLegacySenderKeysShared(sharedSenderKeys);
+        } catch (IOException e) {
+            logger.info("Failed to load shared sender key store, ignoring", e);
+        }
+        try {
             Files.delete(file.toPath());
         } catch (IOException e) {
             logger.info("Failed to load shared sender key store, ignoring", e);