diff --git a/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java b/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java index 00433378e..4ba0e03de 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java @@ -45,7 +45,7 @@ public class LazyTextFieldComp extends Comp> { }); r.focusedProperty().addListener((c, o, n) -> { - if (n) { + if (n && OsType.getLocal() != OsType.WINDOWS) { Platform.runLater(() -> { r.selectEnd(); }); diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java index 5ff066463..9e4f81d01 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java @@ -311,12 +311,16 @@ public interface ExternalRdpClientType extends PrefsChoiceValue { public RemminaRdpType() {super("app.remmina", "remmina", true);} + private List toStrip() { + return List.of("auto connect"); + } + @Override public void launch(LaunchConfiguration configuration) throws Exception { RdpConfig c = configuration.getConfig(); - if (c.getContent().size() == 3 && c.getContent().containsKey("username") && - c.getContent().containsKey("full address") && - c.getContent().containsKey("auto connect")) { + var l = new HashSet<>(c.getContent().keySet()); + toStrip().forEach(l::remove); + if (l.size() == 2 && l.contains("username") && l.contains("full address")) { var encrypted = encryptPassword(configuration.getPassword()); if (encrypted.isPresent()) { var file = writeRemminaConfigFile(configuration, encrypted.get()); @@ -370,6 +374,7 @@ public interface ExternalRdpClientType extends PrefsChoiceValue { username=%s server=%s password=%s + cert_ignore=1 """.formatted(configuration.getTitle(), configuration.getConfig().get("username").orElseThrow().getValue(), configuration.getConfig().get("full address").orElseThrow().getValue(), diff --git a/version b/version index 821e52182..0fcca4c86 100644 --- a/version +++ b/version @@ -1 +1 @@ -15.1-8 +15.1-9