fix: deliver system breadcrumbs in the main thread on Android

Author: jpnurmi

src/Sentry.Bindings.Android/Transforms/Metadata.xml

@@ -85,6 +85,9 @@
     </method>
   </add-node>
 
+  <!-- Remove problematic deprecated methods in the IScopes interface -->
+  <remove-node path="/api/package[@name='io.sentry']/interface[@name='IScopes']/method[@deprecated]" />
+
   <!--
     TODO: If we need this, figure out how to multi-target or late bind.
     This API uses FrameMetrics, which requires Android >= 24.0.  We currently target Android >= 21.0 which is the minimum supported by MAUI.

src/Sentry/Platforms/Android/AndroidDiagnosticLogger.cs

@@ -5,21 +5,21 @@ namespace Sentry.Android;
 
 internal class AndroidDiagnosticLogger : JavaObject, JavaSdk.ILogger
 {
-    private readonly IDiagnosticLogger _logger;
+    private readonly IDiagnosticLogger? _logger;
 
-    public AndroidDiagnosticLogger(IDiagnosticLogger logger) => _logger = logger;
+    public AndroidDiagnosticLogger(IDiagnosticLogger? logger) => _logger = logger;
 
     public void Log(JavaSdk.SentryLevel level, string message, JavaObject[]? args) =>
-        _logger.Log(level.ToSentryLevel(), "Android: " + FormatJavaString(message, args));
+        _logger?.Log(level.ToSentryLevel(), "Android: " + FormatJavaString(message, args));
 
     public void Log(JavaSdk.SentryLevel level, string message, Throwable? throwable) =>
-        _logger.Log(level.ToSentryLevel(), "Android: " + message, throwable);
+        _logger?.Log(level.ToSentryLevel(), "Android: " + message, throwable);
 
     public void Log(JavaSdk.SentryLevel level, Throwable? throwable, string message, params JavaObject[]? args) =>
-        _logger.Log(level.ToSentryLevel(), "Android: " + FormatJavaString(message, args), throwable);
+        _logger?.Log(level.ToSentryLevel(), "Android: " + FormatJavaString(message, args), throwable);
 
     public bool IsEnabled(JavaSdk.SentryLevel? level) =>
-        level != null && _logger.IsEnabled(level.ToSentryLevel());
+        level != null && _logger != null && _logger.IsEnabled(level.ToSentryLevel());
 
     private static string FormatJavaString(string s, JavaObject[]? args) =>
         args is null ? s : JavaString.Format(s, args);

src/Sentry/Platforms/Android/Sentry.Android.props

@@ -9,6 +9,8 @@
     <Using Include="Android.Runtime" />
     <Using Include="Android.Content.Context" Alias="AndroidContext" />
     <Using Include="Android.OS.Build" Alias="AndroidBuild" />
+    <Using Include="Android.OS.Looper" Alias="AndroidLooper" />
+    <Using Include="Android.OS.Handler" Alias="AndroidHandler" />
     <Using Include="Java.Lang.Boolean" Alias="JavaBoolean" />
     <Using Include="Java.Lang.Class" Alias="JavaClass" />
     <Using Include="Java.Lang.Double" Alias="JavaDouble" />

src/Sentry/Platforms/Android/SentrySdk.cs

@@ -4,7 +4,9 @@
 using Sentry.Android.Callbacks;
 using Sentry.Android.Extensions;
 using Sentry.Extensibility;
+using Sentry.JavaSdk;
 using Sentry.JavaSdk.Android.Core;
+using Sentry.JavaSdk.Android.Core.Internal.Util;
 
 // Don't let the Sentry Android SDK auto-init, as we do that manually in SentrySdk.Init
 // See https://docs.sentry.io/platforms/android/configuration/manual-init/
@@ -155,6 +157,16 @@ private static void InitSentryAndroidSdk(SentryOptions options)
 
             // Don't capture managed exceptions in the native SDK, since we already capture them in the managed SDK
             o.AddIgnoredExceptionForType(JavaClass.ForName("android.runtime.JavaProxyThrowable"));
+
+            // Deliver network and system event breadcrumbs in the main thread
+            // See https://github.com/getsentry/sentry-dotnet/issues/3828
+            var networkLogger = new AndroidDiagnosticLogger(options.DiagnosticLogger);
+            var buildInfoProvider = new BuildInfoProvider(networkLogger);
+            var timeProvider = AndroidCurrentDateProvider.Instance!;
+            var mainHandler = new AndroidHandler(AndroidLooper.MainLooper!);
+            o.ConnectionStatusProvider =
+                new AndroidConnectionStatusProvider(AppContext, o, buildInfoProvider, timeProvider, mainHandler).JavaCast<IConnectionStatusProvider>();
+            o.AddIntegration(new SystemEventsBreadcrumbsIntegration(AppContext, mainHandler).JavaCast<JavaSdk.IIntegration>());
         });
 
         // Now initialize the Android SDK (with a logger only if we're debugging)