Merge branch 'main' into terminal

Author: yaira2

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -267,6 +267,12 @@ public static void HandleAppUnhandledException(Exception? ex, bool showToastNoti
 				ex.Data[Mechanism.HandledKey] = false;
 				ex.Data[Mechanism.MechanismKey] = "Application.UnhandledException";
 
+				SentrySdk.CaptureException(ex, scope =>
+				{
+					scope.User.Id = generalSettingsService?.UserId;
+					scope.Level = SentryLevel.Fatal;
+				});
+
 				formattedException.AppendLine($">>>> HRESULT: {ex.HResult}");
 
 				if (ex.Message is not null)

src/Files.App/Utils/Logger/SentryLogger.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Extensions.Logging;
 using Sentry;
+using Sentry.Protocol;
 
 namespace Files.App.Utils.Logger
 {
@@ -21,7 +22,8 @@ public bool IsEnabled(LogLevel logLevel)
 
 		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
 		{
-			if (exception is null)
+			// Unhandled exceptions are captured in AppLifecycleHelper.HandleAppUnhandledException
+			if (exception is null || exception.Data[Mechanism.HandledKey] is false)
 				return;
 
 			var generalSettingsService = Ioc.Default.GetRequiredService<IGeneralSettingsService>();