Fix issues with icon loading

Assets/Scripts/CustomIconLoader.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
@@ -40,8 +41,12 @@ public class CustomIconLoader : MonoBehaviour
             var cachedIcon = BazookaManager.Instance.iconCache.FirstOrDefault(icon => icon.ID == obj.ID);
             if (cachedIcon != null)
             {
-                try { Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent<Image>()); }
+                var (d, h) = Tools.FixIconData(cachedIcon.Data);
-                catch { Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent<SpriteRenderer>()); }
+                if (d != null && h != null && Tools.Sha512Sum(Convert.FromBase64String(d)) == h)
+                {
+                    try { Tools.RenderFromBase64(d, obj.GetComponent<Image>()); }
+                    catch { Tools.RenderFromBase64(d, obj.GetComponent<SpriteRenderer>()); }
+                }
             }
             Destroy(obj);
         }

Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs

@@ -166,8 +166,8 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
         {
             GameObject newIcon = Instantiate(sample, content.transform);
             newIcon.name = "IconEntry";
-
+            var (d, h) = Tools.FixIconData(entry.Data);
-            Tools.RenderFromBase64(Tools.FixIconData(entry.Data).Item1, newIcon.transform.GetChild(0).GetChild(0).GetComponent<Image>());
+            if (d != null && h != null && Tools.Sha512Sum(Convert.FromBase64String(d)) == h) Tools.RenderFromBase64(d, newIcon.transform.GetChild(0).GetChild(0).GetComponent<Image>());
             newIcon.transform.GetChild(1).GetComponent<TMP_Text>().text = "Bird Name: " + entry.Name;
             newIcon.transform.GetChild(2).GetComponent<TMP_Text>().text = "Price " + Tools.FormatWithCommas(entry.Price) + " coins";
             newIcon.transform.GetChild(3).GetComponent<TMP_Text>().text = "Designer Name: " + entry.CreatorUsername;

Assets/Scripts/IconsMenu.cs

@@ -24,7 +24,7 @@ public class Iconsmenu : MonoBehaviour
     [SerializeField] private GameObject previewBirdObject;
     [SerializeField] private ColorPanel iconColorPanel;
     [SerializeField] private ColorPanel overlayColorPanel;
-    private Dictionary<string, Button> customIcons = new();
+    private readonly Dictionary<string, Button> customIcons = new();
 
     private void Start()
     {
@@ -136,12 +136,11 @@ public class Iconsmenu : MonoBehaviour
         if (customIconData.Selected != null)
             foreach (var icon in customIconData.Purchased)
             {
-                if (icon == customIconData.Selected) SelectCustomIcon(icon);
+                if (icon == customIconData.Selected) SelectCustomIcon(icon, false);
                 customIcons[icon].interactable = icon != customIconData.Selected;
             }
 
-        var objects = FindObjectsByType<WaitingForCustomIcon>(FindObjectsSortMode.None);
+        RenderIcons();
-        if (objects.Length != 0) CustomIconLoader.Init(objects);
     }
 
     private void ToggleKit()
@@ -217,14 +216,13 @@ public class Iconsmenu : MonoBehaviour
         else previewOverlay.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlayID);
     }
 
-    void SelectCustomIcon(string icon)
+    void SelectCustomIcon(string icon, bool renderIcons = true)
     {
         var customData = BazookaManager.Instance.GetCustomBirdIconData();
         customData.Selected = icon;
         BazookaManager.Instance.SetCustomBirdIconData(customData);
-        var waitingForCustomIcon = previewBird.AddComponent<WaitingForCustomIcon>();
+        previewBird.AddComponent<WaitingForCustomIcon>().ID = icon;
-        waitingForCustomIcon.ID = icon;
+        if (renderIcons) RenderIcons();
-        CustomIconLoader.Init(new[] { waitingForCustomIcon });
         previewBird.color = Color.white;
         previewOverlay.gameObject.SetActive(false);
         previewOverlay.sprite = null;
@@ -239,4 +237,10 @@ public class Iconsmenu : MonoBehaviour
     {
         if (Keyboard.current.escapeKey.wasPressedThisFrame) await SceneManager.LoadSceneAsync("MainMenu");
     }
+
+    void RenderIcons()
+    {
+        var objects = FindObjectsByType<WaitingForCustomIcon>(FindObjectsSortMode.None);
+        if (objects.Length != 0) CustomIconLoader.Init(objects);
+    }
 }

Assets/Scripts/Tools.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Numerics;
+using System.Security.Cryptography;
+using System.Text;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -65,6 +67,8 @@ public static class Tools
     }
 
     public static (string, string) FixIconData(string i)
+    {
+        try
         {
             int t = i.Length;
             int h = 128;
@@ -88,4 +92,21 @@ public static class Tools
 
             return (D, H);
         }
+        catch
+        {
+            return (null, null);
+        }
+    }
+
+    public static string Sha512Sum(byte[] data)
+    {
+        using var sha512 = SHA512.Create();
+        var hash = sha512.ComputeHash(data);
+
+        var sb = new StringBuilder(hash.Length * 2);
+        foreach (var b in hash)
+            sb.Append(b.ToString("x2"));
+
+        return sb.ToString();
+    }
 }