From ecc9536a854eaccf8d29e17b60473d213baf7d99 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 5 May 2025 10:05:28 +0000
Subject: [PATCH] Small fixes

---
 app/src/main/java/io/xpipe/app/issue/ErrorEvent.java  |  3 ---
 .../main/java/io/xpipe/app/issue/GuiErrorHandler.java |  1 -
 .../java/io/xpipe/app/issue/SentryErrorHandler.java   | 11 ++++++++---
 .../main/java/io/xpipe/app/update/ChocoUpdater.java   |  2 +-
 4 files changed, 9 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 ab9123718..640581022 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
@@ -36,9 +36,6 @@ 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 53b9aeb37..73ae84066 100644
--- a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java
@@ -36,7 +36,6 @@ public class GuiErrorHandler extends GuiErrorHandlerBase implements ErrorHandler
         if (lex.isPresent()) {
             LicenseProvider.get().showLicenseAlert(lex.get());
             if (!LicenseProvider.get().hasPaidLicense()) {
-                event.setLicenseRequired(true);
                 event.clearAttachments();
                 ErrorAction.ignore().handle(event);
             }
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 a2e98fc69..9e1ae3fa1 100644
--- a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
@@ -11,6 +11,7 @@ import io.sentry.*;
 import io.sentry.protocol.Geo;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
+import io.xpipe.app.util.LicenseRequiredException;
 import org.apache.commons.io.FileUtils;
 
 import java.io.ByteArrayInputStream;
@@ -57,6 +58,10 @@ public class SentryErrorHandler implements ErrorHandler {
             return throwable;
         }
 
+        if (throwable instanceof LicenseRequiredException) {
+            return throwable;
+        }
+
         try {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -114,7 +119,7 @@ public class SentryErrorHandler implements ErrorHandler {
         }
 
         if (ee.getThrowable() != null) {
-            var adjusted = adjustCopy(ee.getThrowable(), !ee.isShouldSendDiagnostics() && !ee.isLicenseRequired());
+            var adjusted = adjustCopy(ee.getThrowable(), !ee.isShouldSendDiagnostics());
             return Sentry.captureException(adjusted, sc -> fillScope(ee, sc));
         }
 
@@ -196,7 +201,7 @@ public class SentryErrorHandler implements ErrorHandler {
         s.setTag("unhandled", Boolean.toString(ee.isUnhandled()));
 
         s.setTag("diagnostics", Boolean.toString(ee.isShouldSendDiagnostics()));
-        s.setTag("licenseRequired", Boolean.toString(ee.isLicenseRequired()));
+        s.setTag("licenseRequired", Boolean.toString(ee.getThrowable() instanceof LicenseRequiredException));
         s.setTag(
                 "fallbackShell",
                 AppPrefs.get() != null
@@ -207,7 +212,7 @@ public class SentryErrorHandler implements ErrorHandler {
         var exMessage = ee.getThrowable() != null ? ee.getThrowable().getMessage() : null;
         if (ee.getDescription() != null
                 && !ee.getDescription().equals(exMessage)
-                && (ee.isShouldSendDiagnostics() || ee.isLicenseRequired())) {
+                && (ee.isShouldSendDiagnostics() || ee.getThrowable() instanceof LicenseRequiredException)) {
             s.setTag("message", ee.getDescription().lines().collect(Collectors.joining(" ")));
         }
 
diff --git a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java
index e0a34c8ef..ffce34ba8 100644
--- a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java
+++ b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java
@@ -114,7 +114,7 @@ public class ChocoUpdater extends UpdateHandler {
             AppCache.update("performedUpdate", performedUpdate);
             OperationMode.executeAfterShutdown(() -> {
                 TerminalLauncher.openDirectFallback("XPipe Updater", sc -> {
-                    var pkg = AppProperties.get().isStaging() ? "xpipe-ptb" : "xpipe";
+                    var pkg = "xpipe";
                     return ShellScript.lines(
                             "powershell -Command \"Start-Process -Verb runAs -FilePath choco -ArgumentList upgrade, " + pkg
                                     + "\"",