From: AsamK <asamk@gmx.de>
Date: Fri, 15 Jul 2022 18:13:36 +0000 (+0200)
Subject: Fix issue with loading legacy profile store
X-Git-Tag: v0.10.9~6
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9da2a0040358c57c27fbbf3c98d416b243070832?ds=inline

Fix issue with loading legacy profile store

Fixes #981
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
index b3aa4f8c..be275116 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
@@ -60,7 +60,7 @@ public class LegacyProfileStore {
                         }
                     }
                     var lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();
-                    var profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class);
+                    var profile = jsonProcessor.treeToValue(entry.get("profile"), LegacySignalProfile.class);
                     profileEntries.add(new LegacySignalProfileEntry(address,
                             profileKey,
                             lastUpdateTimestamp,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
similarity index 95%
rename from lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
index ed5f0160..e3e18b1e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
@@ -3,7 +3,7 @@ package org.asamk.signal.manager.storage.profiles;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class SignalProfile {
+public class LegacySignalProfile {
 
     @JsonProperty
     @JsonIgnore
@@ -27,7 +27,7 @@ public class SignalProfile {
     @JsonProperty
     private final Capabilities capabilities;
 
-    public SignalProfile(
+    public LegacySignalProfile(
             @JsonProperty("name") final String name,
             @JsonProperty("about") final String about,
             @JsonProperty("aboutEmoji") final String aboutEmoji,
@@ -88,6 +88,9 @@ public class SignalProfile {
         @JsonIgnore
         public boolean uuid;
 
+        @JsonIgnore
+        public boolean gv2;
+
         @JsonProperty
         public boolean storage;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
index 7571146e..609d2f54 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
@@ -12,7 +12,7 @@ public class LegacySignalProfileEntry {
 
     private final long lastUpdateTimestamp;
 
-    private final SignalProfile profile;
+    private final LegacySignalProfile profile;
 
     private final ProfileKeyCredential profileKeyCredential;
 
@@ -20,7 +20,7 @@ public class LegacySignalProfileEntry {
             final RecipientAddress address,
             final ProfileKey profileKey,
             final long lastUpdateTimestamp,
-            final SignalProfile profile,
+            final LegacySignalProfile profile,
             final ProfileKeyCredential profileKeyCredential
     ) {
         this.address = address;
@@ -42,7 +42,7 @@ public class LegacySignalProfileEntry {
         return lastUpdateTimestamp;
     }
 
-    public SignalProfile getProfile() {
+    public LegacySignalProfile getProfile() {
         return profile;
     }