Skip to content

Commit 564cef3

Browse files
committed
Various fixes [release]
1 parent 3c16e36 commit 564cef3

File tree

6 files changed

+26
-13
lines changed

6 files changed

+26
-13
lines changed

app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceSync.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public boolean handle(ErrorEvent event) {
6767
return true;
6868
}
6969
});
70+
event.expected();
7071
event.handle();
7172

7273
if (rename.get()) {

app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import java.io.IOException;
1515
import java.nio.file.Files;
16+
import java.nio.file.InvalidPathException;
1617
import java.nio.file.Path;
1718
import java.util.Optional;
1819

@@ -160,7 +161,14 @@ default Optional<Path> determineFromPath() {
160161
String name = getExecutable();
161162
var out = sc.view().findProgram(name);
162163
if (out.isPresent()) {
163-
return out.map(filePath -> Path.of(filePath.toString()));
164+
return out.flatMap(filePath -> {
165+
try {
166+
return Optional.of(Path.of(filePath.toString()));
167+
} catch (InvalidPathException ex) {
168+
ErrorEventFactory.fromThrowable(ex).omit().handle();
169+
return Optional.empty();
170+
}
171+
});
164172
}
165173
} catch (Exception ex) {
166174
ErrorEventFactory.fromThrowable(ex).omit().handle();

dist/changelog/19.4_incremental.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
- Fix URLs not opening in current Debian sid
2-
- Improve handling of connection filter
1+
- Fix URLs not opening in browser on current Debian sid and potentially other Linux systems
2+
- Fix file browser defaulting to SFTP for connections with no saved state, e.g. when they were synced the first time via git
3+
- Fix password field sometimes throwing errors when capslock was active
4+
- Fix connection filter string match count sometimes being wrong
5+
- Fix connection filter always switching category even if it was not necessary
6+
- Fix errors in SFTP session when right-clicking certain files
37
- Improve Korean translations (Thanks to @nillpoe)

ext/base/src/main/java/io/xpipe/ext/base/host/HostAddressChoiceComp.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,9 @@ public CompStructure<HBox> createBase() {
6464
nodes.add(addButton);
6565
}
6666

67-
var layout = new InputGroupComp(nodes).apply(struc -> struc.get().setFillHeight(true));
68-
layout.apply(struc -> {
69-
struc.get().focusedProperty().addListener((observable, oldValue, newValue) -> {
70-
struc.get().getChildren().getFirst().requestFocus();
71-
});
72-
});
73-
67+
var layout = new InputGroupComp(nodes);
68+
layout.setMainReference(combo);
69+
layout.apply(struc -> struc.get().setFillHeight(true));
7470
return new SimpleCompStructure<>(layout.createStructure().get());
7571
}
7672

ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ private static OptionsBuilder http(Property<ServiceProtocolType.Http> p) {
3737
var path = new SimpleStringProperty(p.getValue() != null ? p.getValue().getPath() : null);
3838
return new OptionsBuilder()
3939
.nameAndDescription("servicePath")
40-
.addString(path)
40+
.addComp(new TextFieldComp(path).apply(struc -> {
41+
struc.get().setPromptText("/sub/path");
42+
}), path)
4143
.bind(
4244
() -> {
4345
return new ServiceProtocolType.Http(path.get());
@@ -49,7 +51,9 @@ private static OptionsBuilder https(Property<ServiceProtocolType.Https> p) {
4951
var path = new SimpleStringProperty(p.getValue() != null ? p.getValue().getPath() : null);
5052
return new OptionsBuilder()
5153
.nameAndDescription("servicePath")
52-
.addString(path)
54+
.addComp(new TextFieldComp(path).apply(struc -> {
55+
struc.get().setPromptText("/sub/path");
56+
}), path)
5357
.bind(
5458
() -> {
5559
return new ServiceProtocolType.Https(path.get());

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.4-1
1+
19.4

0 commit comments

Comments
 (0)