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

Small fixes

Browse source
This commit is contained in:
crschnick 2024-08-19 13:05:26 +00:00
parent a08dba4d06
commit 26ef089c44
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,9 @@ public class ErrorEvent {
@Setter @Setter
private boolean shouldSendDiagnostics; private boolean shouldSendDiagnostics;
@Setter
private boolean licenseRequired;
@Singular @Singular
private List<Path> attachments; private List<Path> attachments;

2
app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
View file

@ -35,7 +35,7 @@ public class GuiErrorHandler extends GuiErrorHandlerBase implements ErrorHandler
.findFirst(); .findFirst();
if (lex.isPresent()) { if (lex.isPresent()) {
LicenseProvider.get().showLicenseAlert(lex.get()); LicenseProvider.get().showLicenseAlert(lex.get());
event.setShouldSendDiagnostics(true); event.setLicenseRequired(true);
event.clearAttachments(); event.clearAttachments();
ErrorAction.ignore().handle(event); ErrorAction.ignore().handle(event);
} else { } else {

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

@ -1,5 +1,8 @@
package io.xpipe.app.issue; package io.xpipe.app.issue;
import io.sentry.*;
import io.sentry.protocol.SentryId;
import io.sentry.protocol.User;
import io.xpipe.app.core.AppLogs; import io.xpipe.app.core.AppLogs;
import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.AppProperties;
import io.xpipe.app.core.AppState; import io.xpipe.app.core.AppState;
@ -7,10 +10,6 @@ import io.xpipe.app.core.mode.OperationMode;
import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.update.XPipeDistributionType;
import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.LicenseProvider;
import io.sentry.*;
import io.sentry.protocol.SentryId;
import io.sentry.protocol.User;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -98,7 +97,7 @@ public class SentryErrorHandler implements ErrorHandler {
} }
if (ee.getThrowable() != null) { if (ee.getThrowable() != null) {
var adjusted = adjustCopy(ee.getThrowable(), !ee.isShouldSendDiagnostics()); var adjusted = adjustCopy(ee.getThrowable(), !ee.isShouldSendDiagnostics() && !ee.isLicenseRequired());
return Sentry.captureException(adjusted, sc -> fillScope(ee, sc)); return Sentry.captureException(adjusted, sc -> fillScope(ee, sc));
} }
@ -153,7 +152,6 @@ public class SentryErrorHandler implements ErrorHandler {
: "false"); : "false");
s.setTag("terminal", Boolean.toString(ee.isTerminal())); s.setTag("terminal", Boolean.toString(ee.isTerminal()));
s.setTag("omitted", Boolean.toString(ee.isOmitted())); s.setTag("omitted", Boolean.toString(ee.isOmitted()));
s.setTag("diagnostics", Boolean.toString(ee.isShouldSendDiagnostics()));
s.setTag( s.setTag(
"logs", "logs",
Boolean.toString( Boolean.toString(
@ -161,8 +159,11 @@ public class SentryErrorHandler implements ErrorHandler {
s.setTag("inShutdown", Boolean.toString(OperationMode.isInShutdown())); s.setTag("inShutdown", Boolean.toString(OperationMode.isInShutdown()));
s.setTag("unhandled", Boolean.toString(ee.isUnhandled())); s.setTag("unhandled", Boolean.toString(ee.isUnhandled()));
s.setTag("diagnostics", Boolean.toString(ee.isShouldSendDiagnostics()));
s.setTag("licenseRequired", Boolean.toString(ee.isLicenseRequired()));
var exMessage = ee.getThrowable() != null ? ee.getThrowable().getMessage() : null; var exMessage = ee.getThrowable() != null ? ee.getThrowable().getMessage() : null;
if (ee.getDescription() != null && !ee.getDescription().equals(exMessage) && ee.isShouldSendDiagnostics()) { if (ee.getDescription() != null && !ee.getDescription().equals(exMessage) && (ee.isShouldSendDiagnostics() || ee.isLicenseRequired())) {
s.setTag("message", ee.getDescription().lines().collect(Collectors.joining(" "))); s.setTag("message", ee.getDescription().lines().collect(Collectors.joining(" ")));
} }