From 610cd088429190cf46de3dfe79eb03c4e7ac84e7 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 21 Mar 2025 10:23:04 +0000
Subject: [PATCH] Rework password manager choices

---
 .../main/java/io/xpipe/app/comp/base/ListBoxViewComp.java  | 7 ++++++-
 dist/changelogs/15.8_incremental.md                        | 1 +
 .../io/xpipe/ext/base/identity/SshIdentityStrategy.java    | 5 +++--
 version                                                    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java b/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java
index 96b19f07b..5b992ddcb 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java
@@ -150,8 +150,13 @@ public class ListBoxViewComp<T> extends Comp<CompStructure<ScrollPane>> {
         });
         if (StoreViewState.get() != null) {
             StoreViewState.get().getSortMode().addListener((observable, oldValue, newValue) -> {
+                // This is very ugly, but it just takes multiple iterations for the order to apply
                 Platform.runLater(() -> {
-                    dirty.set(true);
+                    Platform.runLater(() -> {
+                        Platform.runLater(() -> {
+                            dirty.set(true);
+                        });
+                    });
                 });
             });
         }
diff --git a/dist/changelogs/15.8_incremental.md b/dist/changelogs/15.8_incremental.md
index 9c9d1ede6..5660a9875 100644
--- a/dist/changelogs/15.8_incremental.md
+++ b/dist/changelogs/15.8_incremental.md
@@ -1,5 +1,6 @@
 - Fix PowerShell-based shell sessions freezing after some time due to a wrong $ErrorActionPreference. This issue especially broke local machine shell sessions on Windows system with PowerShell being the default shell
 - Fix VNC connections with 24-bit color depths getting rendered with switched colors
+- Fix SSH key permissions being changed to 400 even if they were already correct
 - Fix SSH askpass failing for portable installations in a directory with non-ASCII characters due to an OpenSSH bug
 - Fix random ConcurrentModificationExceptions breaking the gui layout
 - Fix file browser download box buttons being usable and potentially misleading while a download was in progress
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
index 728f5e673..cfd7125e1 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
@@ -195,8 +195,9 @@ public interface SshIdentityStrategy {
             }
 
             if ((parent.getOsType().equals(OsType.LINUX) || parent.getOsType().equals(OsType.MACOS))) {
-                parent.command(CommandBuilder.of().add("chmod", "400").addFile(resolved))
-                        .executeAndCheck();
+                // Try to preserve the same permission set
+                parent.command(CommandBuilder.of().add("test", "-w").addFile(resolved).add("&&", "chmod", "600")
+                        .addFile(resolved).add("||", "chmod", "400").addFile(resolved)).executeAndCheck();
             }
         }
 
diff --git a/version b/version
index 78ee3d0fb..dfb627976 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-15.8-3
+15.8-5