From 26ef089c449c7d134b2591be684bf0efc6e05efa Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 19 Aug 2024 13:05:26 +0000
Subject: [PATCH] Small fixes

---
 .../main/java/io/xpipe/app/issue/ErrorEvent.java  |  3 +++
 .../java/io/xpipe/app/issue/GuiErrorHandler.java  |  2 +-
 .../io/xpipe/app/issue/SentryErrorHandler.java    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java b/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
index e1a9b2412..9de92176e 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
@@ -37,6 +37,9 @@ public class ErrorEvent {
     @Setter
     private boolean shouldSendDiagnostics;
 
+    @Setter
+    private boolean licenseRequired;
+
     @Singular
     private List<Path> attachments;
 
diff --git a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
index 46daeae22..10ed192d0 100644
--- a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
@@ -35,7 +35,7 @@ public class GuiErrorHandler extends GuiErrorHandlerBase implements ErrorHandler
                 .findFirst();
         if (lex.isPresent()) {
             LicenseProvider.get().showLicenseAlert(lex.get());
-            event.setShouldSendDiagnostics(true);
+            event.setLicenseRequired(true);
             event.clearAttachments();
             ErrorAction.ignore().handle(event);
         } else {
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 3359ce6cb..f8ed8d1e2 100644
--- a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
@@ -1,5 +1,8 @@
 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.AppProperties;
 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.update.XPipeDistributionType;
 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 java.io.ByteArrayInputStream;
@@ -98,7 +97,7 @@ public class SentryErrorHandler implements ErrorHandler {
         }
 
         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));
         }
 
@@ -153,7 +152,6 @@ public class SentryErrorHandler implements ErrorHandler {
                         : "false");
         s.setTag("terminal", Boolean.toString(ee.isTerminal()));
         s.setTag("omitted", Boolean.toString(ee.isOmitted()));
-        s.setTag("diagnostics", Boolean.toString(ee.isShouldSendDiagnostics()));
         s.setTag(
                 "logs",
                 Boolean.toString(
@@ -161,8 +159,11 @@ public class SentryErrorHandler implements ErrorHandler {
         s.setTag("inShutdown", Boolean.toString(OperationMode.isInShutdown()));
         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;
-        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(" ")));
         }