From f585969233738cc53704d39bf1a29da21eda7a5b Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 13 Apr 2024 21:05:28 +0000
Subject: [PATCH] Rework file icon loading

---
 .../xpipe/app/browser/session/BrowserChooserModel.java | 10 ----------
 .../xpipe/app/browser/session/BrowserSessionModel.java | 10 ----------
 app/src/main/java/io/xpipe/app/core/mode/GuiMode.java  | 10 ++++++++++
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserModel.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserModel.java
index c93b6500..c402d806 100644
--- a/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserModel.java
@@ -2,9 +2,6 @@ package io.xpipe.app.browser.session;
 
 import io.xpipe.app.browser.file.BrowserEntry;
 import io.xpipe.app.browser.fs.OpenFileSystemModel;
-import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
-import io.xpipe.app.browser.icon.BrowserIconFileType;
-import io.xpipe.app.browser.icon.FileIconManager;
 import io.xpipe.app.fxcomps.util.ListBindingsHelper;
 import io.xpipe.app.storage.DataStoreEntryRef;
 import io.xpipe.app.util.BooleanScope;
@@ -77,13 +74,6 @@ public class BrowserChooserModel extends BrowserAbstractSessionModel<OpenFileSys
             return;
         }
 
-        // Only load icons when a file system is opened
-        ThreadHelper.runAsync(() -> {
-            BrowserIconFileType.loadDefinitions();
-            BrowserIconDirectoryType.loadDefinitions();
-            FileIconManager.loadIfNecessary();
-        });
-
         ThreadHelper.runFailableAsync(() -> {
             OpenFileSystemModel model;
 
diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java
index 931cb10d..bd8f820e 100644
--- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java
@@ -4,9 +4,6 @@ import io.xpipe.app.browser.BrowserSavedState;
 import io.xpipe.app.browser.BrowserSavedStateImpl;
 import io.xpipe.app.browser.BrowserTransferModel;
 import io.xpipe.app.browser.fs.OpenFileSystemModel;
-import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
-import io.xpipe.app.browser.icon.BrowserIconFileType;
-import io.xpipe.app.browser.icon.FileIconManager;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntryRef;
 import io.xpipe.app.util.BooleanScope;
@@ -77,13 +74,6 @@ public class BrowserSessionModel extends BrowserAbstractSessionModel<BrowserSess
             return;
         }
 
-        // Only load icons when a file system is opened
-        ThreadHelper.runAsync(() -> {
-            BrowserIconFileType.loadDefinitions();
-            BrowserIconDirectoryType.loadDefinitions();
-            FileIconManager.loadIfNecessary();
-        });
-
         ThreadHelper.runFailableAsync(() -> {
             OpenFileSystemModel model;
 
diff --git a/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java b/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java
index 91b85ddc..c6d82c9a 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java
@@ -1,5 +1,8 @@
 package io.xpipe.app.core.mode;
 
+import io.xpipe.app.browser.icon.BrowserIconDirectoryType;
+import io.xpipe.app.browser.icon.BrowserIconFileType;
+import io.xpipe.app.browser.icon.FileIconManager;
 import io.xpipe.app.core.App;
 import io.xpipe.app.core.AppGreetings;
 import io.xpipe.app.core.AppMainWindow;
@@ -8,6 +11,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.update.UpdateChangelogAlert;
+import io.xpipe.app.util.ThreadHelper;
 import javafx.stage.Stage;
 
 public class GuiMode extends PlatformMode {
@@ -47,6 +51,12 @@ public class GuiMode extends PlatformMode {
         });
         TrackEvent.info("Window setup complete");
 
+        ThreadHelper.runAsync(() -> {
+            BrowserIconFileType.loadDefinitions();
+            BrowserIconDirectoryType.loadDefinitions();
+            FileIconManager.loadIfNecessary();
+        });
+
         UpdateChangelogAlert.showIfNeeded();
     }
 }