From d69d0097ef1e9694c231f992b41f39969c23ef67 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 21 Apr 2025 19:41:04 +0200
Subject: [PATCH] Guard Bugsnag delivery

---
 app/src/main/java/com/bugsnag/android/DefaultDelivery.kt | 2 ++
 app/src/main/java/eu/faircode/email/Log.java             | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/bugsnag/android/DefaultDelivery.kt b/app/src/main/java/com/bugsnag/android/DefaultDelivery.kt
index 2d8861ef24..b498db7318 100644
--- a/app/src/main/java/com/bugsnag/android/DefaultDelivery.kt
+++ b/app/src/main/java/com/bugsnag/android/DefaultDelivery.kt
@@ -35,6 +35,8 @@ internal class DefaultDelivery(
         integrity: String?,
         headers: Map<String, String?>
     ): DeliveryStatus {
+        if (!System.getProperty("com.bugsnag.android.enabled").toBoolean())
+            return DeliveryStatus.FAILURE // Should not happen
 
         TrafficStats.setThreadStatsTag(1)
         if (connectivity != null && !connectivity.hasNetworkConnection()) {
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 45bf5687ba..57aa7ba65a 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -314,6 +314,7 @@ public class Log {
 
     static void setCrashReporting(boolean enabled) {
         try {
+            System.setProperty("com.bugsnag.android.enabled", Boolean.toString(enabled));
             if (enabled)
                 Bugsnag.resumeSession();
             else
@@ -589,8 +590,10 @@ public class Log {
             Log.i("uuid=" + uuid);
             client.setUser(uuid, null, null);
 
-            if (prefs.getBoolean("crash_reports", false) || Log.isTestRelease())
+            if (prefs.getBoolean("crash_reports", false) || Log.isTestRelease()) {
+                System.setProperty("com.bugsnag.android.enabled", Boolean.toString(true));
                 Bugsnag.startSession();
+            }
         } catch (Throwable ex) {
             Log.e(ex);
             /*