beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-20 06:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly escape docker ls command

Browse source
This commit is contained in:
crschnick 2023-04-03 15:42:16 +00:00
parent 75145293c7
commit 289d4d89cc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
View file

@ -10,6 +10,7 @@ import org.apache.commons.io.FileUtils;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.Date; import java.util.Date;
import java.util.stream.Collectors;
public class SentryErrorHandler { public class SentryErrorHandler {
@ -88,7 +89,7 @@ public class SentryErrorHandler {
if (ee.getThrowable() != null) { if (ee.getThrowable() != null) {
if (ee.getDescription() != null if (ee.getDescription() != null
&& !ee.getDescription().equals(ee.getThrowable().getMessage())) { && !ee.getDescription().equals(ee.getThrowable().getMessage())) {
s.setTag("message", ee.getDescription()); s.setTag("message", ee.getDescription().lines().collect(Collectors.joining(" ")));
} }
} }

2
app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java
View file

@ -32,7 +32,7 @@ public class UpdateAvailableAlert {
} }
alert.getButtonTypes().clear(); 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)); alert.getButtonTypes().add(new ButtonType(AppI18n.get("ignore"), ButtonBar.ButtonData.NO));
}) })
.map(buttonType -> buttonType.getButtonData().isDefaultButton()) .map(buttonType -> buttonType.getButtonData().isDefaultButton())