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 ad42984fbe4da146b154652a74c6d409b9cca168..b6205c97454bb5a8f2722e2ceb66e7b505ce1828 100644 (file)
--- 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) {
 
 
     public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {
 

-        private record GroupV1(
+        public record GroupV1(

                 String groupId,
                 String expectedV2Id,
                 String name,
                 String groupId,
                 String expectedV2Id,
                 String name,


@@ -140,9 +140,9 @@ public class LegacyGroupStore {
                 @JsonDeserialize(using = MembersDeserializer.class) List<Member> members
         ) {
 
                 @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>> {
 
 
             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,
                 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 a2f5162eb245f8dd4f9603c12ff77a43e49bab8c..88e23e7560b9301032a3645f6b3578db49a682e2 100644 (file)
--- 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 dd044536c7e99d057492484448a2415f47c8a776..16836d583713c4d89e45dc93379fcb108aaa4e38 100644 (file)
--- 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) {
 
 
     public record Storage(List<Sticker> stickers) {
 

-        private record Sticker(String packId, String packKey, boolean installed) {
+        public record Sticker(String packId, String packKey, boolean installed) {

 
         }
     }
 
         }
     }