From 0acb23363abc6292cd6e3ebfaf97db6ea8a967b7 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 21 Aug 2025 17:02:43 +0000 Subject: [PATCH] Small fixes --- app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java | 2 +- .../java/io/xpipe/app/pwman/BitwardenPasswordManager.java | 5 ++++- app/src/main/java/io/xpipe/app/util/DesktopHelper.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java index 15b508a0f..3d9f01c8f 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java @@ -102,7 +102,7 @@ public class ErrorHandlerComp extends SimpleComp { descriptionField.setEditable(false); descriptionField.setPadding(Insets.EMPTY); descriptionField.getStyleClass().add("description"); - AppFontSizes.xs(descriptionField); + AppFontSizes.sm(descriptionField); var text = new VBox(descriptionField); text.setFillWidth(true); text.setSpacing(8); diff --git a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java index ec3812a94..df148a543 100644 --- a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java @@ -13,6 +13,8 @@ import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.annotation.JsonTypeName; +import java.nio.file.Files; + @JsonTypeName("bitwarden") public class BitwardenPasswordManager implements PasswordManager { @@ -46,7 +48,8 @@ public class BitwardenPasswordManager implements PasswordManager { var sc = getOrStartShell(); var command = sc.command(CommandBuilder.of().add("bw", "get", "item", "xpipe-test", "--nointeraction")); var r = command.readStdoutAndStderr(); - if (r[1].contains("You are not logged in")) { + // Check for data file as bw seemingly breaks if it doesn't exist yet + if (!Files.exists(AppCache.getBasePath().resolve("data.json")) || r[1].contains("You are not logged in")) { var script = ShellScript.lines( LocalShell.getDialect() .getSetEnvironmentVariableCommand( diff --git a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java index 35a4b6c86..90a4d31cc 100644 --- a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java +++ b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java @@ -105,10 +105,10 @@ public class DesktopHelper { ThreadHelper.runAsync(() -> { var xdg = OsType.getLocal() == OsType.LINUX; - if (Desktop.getDesktop().isSupported(Desktop.Action.OPEN) + if (Desktop.getDesktop().isSupported(Desktop.Action.BROWSE) && AppDistributionType.get() != AppDistributionType.WEBTOP) { try { - Desktop.getDesktop().open(file.toFile()); + Desktop.getDesktop().browse(file.toFile().toURI()); return; } catch (Exception e) { ErrorEventFactory.fromThrowable(e).expected().omitted(xdg).handle();