From a3bc754e8077549c75cc75c5b4dd2aeb1237cec8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 16 May 2023 22:50:27 +0200
Subject: [PATCH] Fix migration of legacy recipient storage

---
 graalvm-config-dir/reflect-config.json                    | 3 +++
 .../manager/storage/recipients/LegacyRecipientStore2.java | 8 ++++----
 .../storage/senderKeys/LegacySenderKeySharedStore.java    | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 3bab701f..f4a975bc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -18,6 +18,9 @@
 {
   "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
 },
+{
+  "name":"[Ljava.lang.Object;"
+},
 {
   "name":"[Ljava.lang.String;"
 },
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 57a60674..bd7605db 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
@@ -98,9 +98,9 @@ public class LegacyRecipientStore2 {
         }
     }
 
-    private record Storage(List<Recipient> recipients, long lastId) {
+    public record Storage(List<Recipient> recipients, long lastId) {
 
-        private record Recipient(
+        public record Recipient(
                 long id,
                 String number,
                 String uuid,
@@ -110,7 +110,7 @@ public class LegacyRecipientStore2 {
                 Profile profile
         ) {
 
-            private record Contact(
+            public record Contact(
                     String name,
                     String color,
                     int messageExpirationTime,
@@ -119,7 +119,7 @@ public class LegacyRecipientStore2 {
                     boolean profileSharingEnabled
             ) {}
 
-            private record Profile(
+            public record Profile(
                     long lastUpdateTimestamp,
                     String givenName,
                     String familyName,
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 cfc36539..b46f8506 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
@@ -61,8 +61,8 @@ public class LegacySenderKeySharedStore {
         }
     }
 
-    private record Storage(List<SharedSenderKey> sharedSenderKeys) {
+    public record Storage(List<SharedSenderKey> sharedSenderKeys) {
 
-        private record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
+        public record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
     }
 }
-- 
2.50.1