From 289d4d89cca50ba243785a9119c685fee5bc980e Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 3 Apr 2023 15:42:16 +0000 Subject: [PATCH] Properly escape docker ls command --- app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java | 3 ++- .../main/java/io/xpipe/app/update/UpdateAvailableAlert.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java index 3bda2198d..3c26965e5 100644 --- a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java @@ -10,6 +10,7 @@ import org.apache.commons.io.FileUtils; import java.nio.file.Files; import java.util.Date; +import java.util.stream.Collectors; public class SentryErrorHandler { @@ -88,7 +89,7 @@ public class SentryErrorHandler { if (ee.getThrowable() != null) { if (ee.getDescription() != null && !ee.getDescription().equals(ee.getThrowable().getMessage())) { - s.setTag("message", ee.getDescription()); + s.setTag("message", ee.getDescription().lines().collect(Collectors.joining(" "))); } } diff --git a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java index 979a08ffc..315d0dd60 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java @@ -32,7 +32,7 @@ public class UpdateAvailableAlert { } alert.getButtonTypes().clear(); - alert.getButtonTypes().add(new ButtonType(AppI18n.get("update"), ButtonBar.ButtonData.OK_DONE)); + alert.getButtonTypes().add(new ButtonType(AppI18n.get("install"), ButtonBar.ButtonData.OK_DONE)); alert.getButtonTypes().add(new ButtonType(AppI18n.get("ignore"), ButtonBar.ButtonData.NO)); }) .map(buttonType -> buttonType.getButtonData().isDefaultButton())