From 48e9ece152021d311a139996401595056df0fc71 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 3 May 2024 15:46:47 +0000
Subject: [PATCH] Various fixes

---
 .../io/xpipe/app/browser/fs/OpenFileSystemModel.java     | 7 ++++---
 app/src/main/java/io/xpipe/app/core/AppIntegration.java  | 9 ++++++++-
 .../main/java/io/xpipe/core/process/CommandControl.java  | 4 ++++
 dist/changelogs/9.1_incremental.md                       | 7 ++++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
index 6503840f..125f9585 100644
--- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java
@@ -319,9 +319,10 @@ public final class OpenFileSystemModel extends BrowserSessionTab<FileSystemStore
 
     private boolean loadFilesSync(String dir) {
         try {
-            if (dir != null) {
-                startIfNeeded();
-                var stream = getFileSystem().listFiles(dir);
+            startIfNeeded();
+            var fs = getFileSystem();
+            if (dir != null && fs != null) {
+                var stream = fs.listFiles(dir);
                 fileList.setAll(stream);
             } else {
                 fileList.setAll(Stream.of());
diff --git a/app/src/main/java/io/xpipe/app/core/AppIntegration.java b/app/src/main/java/io/xpipe/app/core/AppIntegration.java
index 74ca5e6d..5759928b 100644
--- a/app/src/main/java/io/xpipe/app/core/AppIntegration.java
+++ b/app/src/main/java/io/xpipe/app/core/AppIntegration.java
@@ -5,6 +5,7 @@ import io.xpipe.app.core.mode.OperationMode;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.launcher.LauncherInput;
 import io.xpipe.app.prefs.AppPrefs;
+import io.xpipe.app.util.ThreadHelper;
 import io.xpipe.core.process.OsType;
 
 import javax.imageio.ImageIO;
@@ -21,7 +22,13 @@ public class AppIntegration {
                 @Override
                 public void systemAboutToSleep(SystemSleepEvent e) {
                     if (AppPrefs.get() != null && AppPrefs.get().lockVaultOnHibernation().get() && AppPrefs.get().getLockCrypt().get() != null && !AppPrefs.get().getLockCrypt().get().isBlank()) {
-                        OperationMode.close();
+                        // If we run this at the same time as the system is sleeping, there might be exceptions
+                        // because the platform does not like being shut down while sleeping
+                        // This hopefully assures that it will be run later, probably on system wake
+                        ThreadHelper.runAsync(() -> {
+                            ThreadHelper.sleep(1000);
+                            OperationMode.close();
+                        });
                     }
                 }
 
diff --git a/core/src/main/java/io/xpipe/core/process/CommandControl.java b/core/src/main/java/io/xpipe/core/process/CommandControl.java
index 5192e1ca..3fc2bc89 100644
--- a/core/src/main/java/io/xpipe/core/process/CommandControl.java
+++ b/core/src/main/java/io/xpipe/core/process/CommandControl.java
@@ -83,8 +83,12 @@ public interface CommandControl extends ProcessControl {
 
     String readStdoutOrThrow() throws Exception;
 
+    String readStderrOrThrow() throws Exception;
+
     String readStdoutAndWait() throws Exception;
 
+    String readStderrAndWait() throws Exception;
+
     Optional<String> readStdoutIfPossible() throws Exception;
 
     default boolean discardAndCheckExit() throws ProcessOutputException {
diff --git a/dist/changelogs/9.1_incremental.md b/dist/changelogs/9.1_incremental.md
index 7f2b5f76..6171e5ee 100644
--- a/dist/changelogs/9.1_incremental.md
+++ b/dist/changelogs/9.1_incremental.md
@@ -3,11 +3,12 @@
 - Add new setting to automatically lock vault when the local system goes into hibernation/sleep mode if a custom vault passphrase was set
 - Fix sudo elevation password not being filled automatically when launching some remote connection in a terminal
 - Fix git sometimes complaining about an unknown author identity when cloning on new systems
+- Fix search for connections dialog sometimes throwing errors
+- Fix NullPointer when launching an SFTP Client/Termius/VSCode for an SSH connection without a password set
 - Fix macOS terminal and editor app recognition to be more accurate
 - Fix file browser overview buttons both opening the same directory
-- Fix some styling issues
-- Fix search for connections dialog sometimes throwing errors
-- Fix NullPointerException when launching an SFTP Client/Termius/VSCode for an SSH connection without a password set
 - Fix exception on Linux when desktop directory did not exist
 - Fix out of bounds error for certain VNC key input
 - Fix NullPointers when launching a desktop environment for an X11 SSH connection
+- Fix some NullPointers in the file browser
+- Fix some styling issues