fix: Android 5 attachment issues

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- The SDK no longer crashes on Android versions 5 and 6 with native support enabled ([#1652](https://github.com/getsentry/sentry-unity/pull/1652))
+
 ### Dependencies
 
 - Bump Cocoa SDK from v8.25.2 to v8.26.0 ([#1648](https://github.com/getsentry/sentry-unity/pull/1648))

src/Sentry.Unity.Android/AndroidJavaScopeObserver.cs

@@ -14,63 +14,74 @@ public AndroidJavaScopeObserver(SentryOptions options) : base("Android", options
 
         public override void AddBreadcrumbImpl(Breadcrumb breadcrumb)
         {
-            AndroidJNI.AttachCurrentThread();
-            using var sentry = GetSentryJava();
-            using var javaBreadcrumb = new AndroidJavaObject("io.sentry.Breadcrumb");
-            javaBreadcrumb.Set("message", breadcrumb.Message);
-            javaBreadcrumb.Set("type", breadcrumb.Type);
-            javaBreadcrumb.Set("category", breadcrumb.Category);
-            using var javaLevel = breadcrumb.Level.ToJavaSentryLevel();
-            javaBreadcrumb.Set("level", javaLevel);
-            sentry.CallStatic("addBreadcrumb", javaBreadcrumb, null);
+            SentryJniExecutor.FireAndForget(() =>
+            {
+                using var sentry = GetSentryJava();
+                using var javaBreadcrumb = new AndroidJavaObject("io.sentry.Breadcrumb");
+                javaBreadcrumb.Set("message", breadcrumb.Message);
+                javaBreadcrumb.Set("type", breadcrumb.Type);
+                javaBreadcrumb.Set("category", breadcrumb.Category);
+                using var javaLevel = breadcrumb.Level.ToJavaSentryLevel();
+                javaBreadcrumb.Set("level", javaLevel);
+                sentry.CallStatic("addBreadcrumb", javaBreadcrumb, null);
+            });
         }
 
         public override void SetExtraImpl(string key, string? value)
         {
-            AndroidJNI.AttachCurrentThread();
-            using var sentry = GetSentryJava();
-            sentry.CallStatic("setExtra", key, value);
+            SentryJniExecutor.FireAndForget(() =>
+            {
+                using var sentry = GetSentryJava();
+                sentry.CallStatic("setExtra", key, value);
+            });
         }
         public override void SetTagImpl(string key, string value)
         {
-            AndroidJNI.AttachCurrentThread();
-            using var sentry = GetSentryJava();
-            sentry.CallStatic("setTag", key, value);
+            SentryJniExecutor.FireAndForget(() =>
+            {
+                using var sentry = GetSentryJava();
+                sentry.CallStatic("setTag", key, value);
+            });
         }
 
         public override void UnsetTagImpl(string key)
         {
-            AndroidJNI.AttachCurrentThread();
-            using var sentry = GetSentryJava();
-            sentry.CallStatic("removeTag", key);
+            SentryJniExecutor.FireAndForget(() =>
+            {
+                using var sentry = GetSentryJava();
+                sentry.CallStatic("removeTag", key);
+            });
         }
 
         public override void SetUserImpl(SentryUser user)
         {
-            AndroidJNI.AttachCurrentThread();
-
-            AndroidJavaObject? javaUser = null;
-            try
-            {
-                javaUser = new AndroidJavaObject("io.sentry.protocol.User");
-                javaUser.Set("email", user.Email);
-                javaUser.Set("id", user.Id);
-                javaUser.Set("username", user.Username);
-                javaUser.Set("ipAddress", user.IpAddress);
-                using var sentry = GetSentryJava();
-                sentry.CallStatic("setUser", javaUser);
-            }
-            finally
+            SentryJniExecutor.FireAndForget(() =>
             {
-                javaUser?.Dispose();
-            }
+                AndroidJavaObject? javaUser = null;
+                try
+                {
+                    javaUser = new AndroidJavaObject("io.sentry.protocol.User");
+                    javaUser.Set("email", user.Email);
+                    javaUser.Set("id", user.Id);
+                    javaUser.Set("username", user.Username);
+                    javaUser.Set("ipAddress", user.IpAddress);
+                    using var sentry = GetSentryJava();
+                    sentry.CallStatic("setUser", javaUser);
+                }
+                finally
+                {
+                    javaUser?.Dispose();
+                }
+            });
         }
 
         public override void UnsetUserImpl()
         {
-            AndroidJNI.AttachCurrentThread();
-            using var sentry = GetSentryJava();
-            sentry.CallStatic("setUser", null);
+            SentryJniExecutor.FireAndForget(() =>
+            {
+                using var sentry = GetSentryJava();
+                sentry.CallStatic("setUser", null);
+            });
         }
     }
 }

src/Sentry.Unity.Android/SentryJava.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using UnityEngine;
 
 namespace Sentry.Unity.Android
@@ -15,15 +16,13 @@ internal static class SentryJava
     {
         internal static string? GetInstallationId()
         {
-            if (!Attach())
+            return SentryJniExecutor.Run(() =>
             {
-                return null;
-            }
-
-            using var sentry = GetSentryJava();
-            using var hub = sentry.CallStatic<AndroidJavaObject>("getCurrentHub");
-            using var options = hub?.Call<AndroidJavaObject>("getOptions");
-            return options?.Call<string>("getDistinctId");
+                using var sentry = GetSentryJava();
+                using var hub = sentry.CallStatic<AndroidJavaObject>("getCurrentHub");
+                using var options = hub?.Call<AndroidJavaObject>("getOptions");
+                return options?.Call<string>("getDistinctId");
+            });
         }
 
         /// <summary>
@@ -38,25 +37,23 @@ internal static class SentryJava
         /// </returns>
         public static bool? CrashedLastRun()
         {
-            if (!Attach())
+            return SentryJniExecutor.Run(() =>
             {
-                return null;
-            }
-            using var sentry = GetSentryJava();
-            using var jo = sentry.CallStatic<AndroidJavaObject>("isCrashedLastRun");
-            return jo?.Call<bool>("booleanValue");
+                using var sentry = GetSentryJava();
+                using var jo = sentry.CallStatic<AndroidJavaObject>("isCrashedLastRun");
+                return jo?.Call<bool>("booleanValue");
+            });
         }
 
         public static void Close()
         {
-            if (Attach())
+            SentryJniExecutor.FireAndForget(() =>
             {
                 using var sentry = GetSentryJava();
                 sentry.CallStatic("close");
-            }
+            });
         }
 
-        private static bool Attach() => AndroidJNI.AttachCurrentThread() == 0;
         private static AndroidJavaObject GetSentryJava() => new AndroidJavaClass("io.sentry.Sentry");
 
         public static void WriteScope(
@@ -76,17 +73,17 @@ public static void WriteScope(
             bool? GpuMultiThreadedRendering,
             string? GpuGraphicsShaderLevel)
         {
-            if (Attach())
+            SentryJniExecutor.FireAndForget(() =>
             {
                 using var gpu = new AndroidJavaObject("io.sentry.protocol.Gpu");
                 gpu.SetIfNotNull("name", GpuName);
                 gpu.SetIfNotNull("id", GpuId);
-                int intVendorId;
-                if (GpuVendorId is not null && int.TryParse(GpuVendorId, out intVendorId) && intVendorId != 0)
+                if (GpuVendorId is not null && int.TryParse(GpuVendorId, out var intVendorId) && intVendorId != 0)
                 {
                     using var integer = new AndroidJavaObject("java.lang.Integer", intVendorId);
                     gpu.Set("vendorId", integer);
                 }
+
                 gpu.SetIfNotNull("vendorName", GpuVendorName);
                 gpu.SetIfNotNull("memorySize", GpuMemorySize);
                 gpu.SetIfNotNull("apiType", GpuApiType);
@@ -100,7 +97,7 @@ public static void WriteScope(
                     using var contexts = scope.Call<AndroidJavaObject>("getContexts");
                     contexts.Call("setGpu", gpu);
                 }));
-            }
+            });
         }
 
         private static void SetIfNotNull<T>(this AndroidJavaObject javaObject, string property, T? value, string? valueClass = null)

src/Sentry.Unity.Android/SentryJniExecutor.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Threading;
+using UnityEngine;
+
+namespace Sentry.Unity.Android
+{
+    internal static class SentryJniExecutor
+    {
+        public static TResult? Run<TResult>(Func<TResult?> jniOperation)
+        {
+            TResult? result = default;
+            Exception? exception = null;
+
+            var thread = new Thread(() =>
+            {
+                if (AndroidJNI.AttachCurrentThread() != 0)
+                {
+                    exception = new InvalidOperationException("Failed to attach thread to JVM");
+                    return;
+                }
+
+                try
+                {
+                    result = jniOperation();
+                }
+                finally
+                {
+                    AndroidJNI.DetachCurrentThread();
+                }
+            });
+
+            thread.Start();
+            thread.Join();
+
+            if (exception is not null)
+            {
+                // Adding the Sentry logger tag ensures we don't send this error to Sentry.
+                Debug.unityLogger.Log(LogType.Exception, UnityLogger.LogTag, $"Error during JNI execution: {exception}");
+            }
+
+            return result;
+        }
+
+        public static void FireAndForget(Action jniOperation)
+        {
+            Exception? exception = null;
+
+            new Thread(() =>
+            {
+                if (AndroidJNI.AttachCurrentThread() != 0)
+                {
+                    exception = new InvalidOperationException("Failed to attach thread to JVM");
+                    return;
+                }
+
+                try
+                {
+                    jniOperation();
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                }
+                finally
+                {
+                    AndroidJNI.DetachCurrentThread();
+                }
+            }).Start();
+
+            if (exception is not null)
+            {
+                // Adding the Sentry logger tag ensures we don't send this error to Sentry.
+                Debug.unityLogger.Log(LogType.Exception, UnityLogger.LogTag, $"Error during JNI execution: {exception}");
+            }
+        }
+    }
+}