mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-28 23:31:43 +12:00
Merge branch 'xpipe-io:master' into master
This commit is contained in:
commit
db4dc20c70
4 changed files with 20 additions and 7 deletions
|
@ -319,9 +319,10 @@ public final class OpenFileSystemModel extends BrowserSessionTab<FileSystemStore
|
||||||
|
|
||||||
private boolean loadFilesSync(String dir) {
|
private boolean loadFilesSync(String dir) {
|
||||||
try {
|
try {
|
||||||
if (dir != null) {
|
startIfNeeded();
|
||||||
startIfNeeded();
|
var fs = getFileSystem();
|
||||||
var stream = getFileSystem().listFiles(dir);
|
if (dir != null && fs != null) {
|
||||||
|
var stream = fs.listFiles(dir);
|
||||||
fileList.setAll(stream);
|
fileList.setAll(stream);
|
||||||
} else {
|
} else {
|
||||||
fileList.setAll(Stream.of());
|
fileList.setAll(Stream.of());
|
||||||
|
|
|
@ -5,6 +5,7 @@ import io.xpipe.app.core.mode.OperationMode;
|
||||||
import io.xpipe.app.issue.ErrorEvent;
|
import io.xpipe.app.issue.ErrorEvent;
|
||||||
import io.xpipe.app.launcher.LauncherInput;
|
import io.xpipe.app.launcher.LauncherInput;
|
||||||
import io.xpipe.app.prefs.AppPrefs;
|
import io.xpipe.app.prefs.AppPrefs;
|
||||||
|
import io.xpipe.app.util.ThreadHelper;
|
||||||
import io.xpipe.core.process.OsType;
|
import io.xpipe.core.process.OsType;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
|
@ -21,7 +22,13 @@ public class AppIntegration {
|
||||||
@Override
|
@Override
|
||||||
public void systemAboutToSleep(SystemSleepEvent e) {
|
public void systemAboutToSleep(SystemSleepEvent e) {
|
||||||
if (AppPrefs.get() != null && AppPrefs.get().lockVaultOnHibernation().get() && AppPrefs.get().getLockCrypt().get() != null && !AppPrefs.get().getLockCrypt().get().isBlank()) {
|
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();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,12 @@ public interface CommandControl extends ProcessControl {
|
||||||
|
|
||||||
String readStdoutOrThrow() throws Exception;
|
String readStdoutOrThrow() throws Exception;
|
||||||
|
|
||||||
|
String readStderrOrThrow() throws Exception;
|
||||||
|
|
||||||
String readStdoutAndWait() throws Exception;
|
String readStdoutAndWait() throws Exception;
|
||||||
|
|
||||||
|
String readStderrAndWait() throws Exception;
|
||||||
|
|
||||||
Optional<String> readStdoutIfPossible() throws Exception;
|
Optional<String> readStdoutIfPossible() throws Exception;
|
||||||
|
|
||||||
default boolean discardAndCheckExit() throws ProcessOutputException {
|
default boolean discardAndCheckExit() throws ProcessOutputException {
|
||||||
|
|
7
dist/changelogs/9.1_incremental.md
vendored
7
dist/changelogs/9.1_incremental.md
vendored
|
@ -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
|
- 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 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 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 macOS terminal and editor app recognition to be more accurate
|
||||||
- Fix file browser overview buttons both opening the same directory
|
- 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 exception on Linux when desktop directory did not exist
|
||||||
- Fix out of bounds error for certain VNC key input
|
- Fix out of bounds error for certain VNC key input
|
||||||
- Fix NullPointers when launching a desktop environment for an X11 SSH connection
|
- Fix NullPointers when launching a desktop environment for an X11 SSH connection
|
||||||
|
- Fix some NullPointers in the file browser
|
||||||
|
- Fix some styling issues
|
||||||
|
|
Loading…
Reference in a new issue