From 4330102ffa2c4f17685b36553dabbd187d62bfb5 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 21 Aug 2025 12:24:15 +0000
Subject: [PATCH] Small fixes

---
 .../io/xpipe/app/hub/comp/StoreCreationDialog.java     |  2 +-
 .../java/io/xpipe/app/hub/comp/StoreCreationModel.java | 10 +++++++++-
 .../ext/base/identity/ssh/SshIdentityStrategy.java     |  1 -
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java
index f2a1a863a..7ffbf35a8 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java
@@ -215,7 +215,7 @@ public class StoreCreationDialog {
         modal.addButton(new ModalButton(
                         "skip",
                         () -> {
-                            if (showInvalidConfirmAlert()) {
+                            if (!model.wasChanged() || showInvalidConfirmAlert()) {
                                 model.commit(false);
                                 modal.close();
                             } else {
diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java
index e510086d5..1efd53a0c 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java
@@ -189,6 +189,14 @@ public class StoreCreationModel {
         return !eq;
     }
 
+    boolean wasChanged() {
+        if (existingEntry != null && existingEntry.getStore().equals(store.getValue())) {
+            return false;
+        }
+
+        return true;
+    }
+
     void finish() {
         if (finished.get()) {
             return;
@@ -211,7 +219,7 @@ public class StoreCreationModel {
         }
 
         // We didn't change anything
-        if (existingEntry != null && existingEntry.getStore().equals(store.getValue())) {
+        if (!wasChanged()) {
             commit(false);
             return;
         }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/SshIdentityStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/SshIdentityStrategy.java
index 7f8745b4e..7187bc4ea 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/SshIdentityStrategy.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/SshIdentityStrategy.java
@@ -37,7 +37,6 @@ public interface SshIdentityStrategy {
         var l = new ArrayList<Class<?>>();
         l.add(NoneStrategy.class);
         l.add(KeyFileStrategy.class);
-        l.add(OpenSshAgentStrategy.class);
         if (OsType.getLocal() != OsType.WINDOWS) {
             l.add(CustomAgentStrategy.class);
         }