Fix browser race condition

xpipe-io · Jun 9, 2023 · 73e351d · 73e351d
1 parent 20b96d7
commit 73e351d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
@@ -306,22 +306,21 @@ public void initFileSystem() throws Exception {
             this.fileSystem = fs;
             this.local =
                     fs.getShell().map(shellControl -> shellControl.isLocal()).orElse(false);
+            this.initState();
             this.cache.init();
         });
     }
 
     public void initWithGivenDirectory(String dir) throws Exception {
-        initState();
         cdSyncWithoutCheck(dir);
     }
 
     public void initWithDefaultDirectory() throws Exception {
-        initState();
         savedState.cd(null);
         history.updateCurrent(null);
     }
 
-    private void initState() {
+    void initState() {
         this.savedState = OpenFileSystemSavedState.loadForStore(this);
     }
 

diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemSavedState.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemSavedState.java
@@ -71,6 +71,9 @@ public OpenFileSystemSavedState deserialize(JsonParser p, DeserializationContext
                     .constructCollectionLikeType(List.class, RecentEntry.class);
             List<RecentEntry> recentDirectories =
                     JacksonMapper.getDefault().treeToValue(tree.remove("recentDirectories"), javaType);
+            if (recentDirectories == null) {
+                recentDirectories = List.of();
+            }
             var cleaned = recentDirectories.stream()
                     .map(recentEntry -> new RecentEntry(FileNames.toDirectory(recentEntry.directory), recentEntry.time))
                     .filter(distinctBy(recentEntry -> recentEntry.getDirectory()))