From: AsamK <asamk@gmx.de>
Date: Thu, 18 May 2023 09:08:57 +0000 (+0200)
Subject: Fix json deserialization in legacy stores
X-Git-Tag: v0.11.11~14
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/145a2f1179e4e51bdb292f2f2b5622d73c3834a5?ds=sidebyside

Fix json deserialization in legacy stores

Fixes #1248
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index ad42984f..b6205c97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -129,7 +129,7 @@ public class LegacyGroupStore {
 
     public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {
 
-        private record GroupV1(
+        public record GroupV1(
                 String groupId,
                 String expectedV2Id,
                 String name,
@@ -140,9 +140,9 @@ public class LegacyGroupStore {
                 @JsonDeserialize(using = MembersDeserializer.class) List<Member> members
         ) {
 
-            private record Member(Long recipientId, String uuid, String number) {}
+            public record Member(Long recipientId, String uuid, String number) {}
 
-            private record JsonRecipientAddress(String uuid, String number) {}
+            public record JsonRecipientAddress(String uuid, String number) {}
 
             private static class MembersDeserializer extends JsonDeserializer<List<Member>> {
 
@@ -168,7 +168,7 @@ public class LegacyGroupStore {
             }
         }
 
-        private record GroupV2(
+        public record GroupV2(
                 String groupId,
                 String masterKey,
                 String distributionId,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index a2f5162e..88e23e75 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -111,5 +111,5 @@ public class LegacyIdentityKeyStore {
         }
     }
 
-    private record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
+    public record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
index dd044536..16836d58 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
@@ -28,7 +28,7 @@ public class LegacyStickerStore {
 
     public record Storage(List<Sticker> stickers) {
 
-        private record Sticker(String packId, String packKey, boolean installed) {
+        public record Sticker(String packId, String packKey, boolean installed) {
 
         }
     }