From 7992ef7a643598cad22742efceee21f0938f441d Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 23 Aug 2024 19:31:07 +0000
Subject: [PATCH] Parse legacy colors

---
 .../io/xpipe/app/storage/DataStoreEntry.java  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
index e6cebf96..1e6dfbbc 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
@@ -186,6 +186,15 @@ public class DataStoreEntry extends StorageElement {
                 .map(jsonNode -> UUID.fromString(jsonNode.textValue()))
                 .orElse(DataStorage.DEFAULT_CATEGORY_UUID);
         var name = json.required("name").textValue().trim();
+        var color = Optional.ofNullable(json.get("color"))
+                .map(node -> {
+                    try {
+                        return mapper.treeToValue(node, DataColor.class);
+                    } catch (JsonProcessingException e) {
+                        return null;
+                    }
+                })
+                .orElse(null);
 
         var persistentState = stateJson.get("persistentState");
         var lastUsed = Optional.ofNullable(stateJson.get("lastUsed"))
@@ -217,15 +226,16 @@ public class DataStoreEntry extends StorageElement {
         var expanded = Optional.ofNullable(stateJson.get("expanded"))
                 .map(jsonNode -> jsonNode.booleanValue())
                 .orElse(true);
-        var color = Optional.ofNullable(stateJson.get("color"))
-                .map(node -> {
-                    try {
-                        return mapper.treeToValue(node, DataColor.class);
-                    } catch (JsonProcessingException e) {
-                        return null;
-                    }
-                })
-                .orElse(null);
+
+        if (color == null) {
+            color = Optional.ofNullable(stateJson.get("color")).map(node -> {
+                try {
+                    return mapper.treeToValue(node, DataColor.class);
+                } catch (JsonProcessingException e) {
+                    return null;
+                }
+            }).orElse(null);
+        }
 
         String notes = null;
         if (Files.exists(notesFile)) {