From 333aacf4abc38f8f63e6fd92b4efb2d47be11234 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 3 Oct 2022 13:37:49 +0200
Subject: [PATCH] Delete migrated stores after closing the input stream

Fixes #1018
---
 .../manager/storage/recipients/LegacyRecipientStore2.java  | 7 ++++++-
 .../storage/senderKeys/LegacySenderKeySharedStore.java     | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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 29b30ffd..0c05e0c0 100644
--- 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 47465b3e..dfbc2ff9 100644
--- 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);
-- 
2.50.1