Fix sonar cloud issues

justcoding121 · justcoding121 · commit 113fe9cc10d1 · 2025-12-19T21:25:20.000-06:00
diff --git a/.tools/Bible.Alarm.AudioLinksHarvestor/Harvestors/Bible/JwBibleHarvester.cs b/.tools/Bible.Alarm.AudioLinksHarvestor/Harvestors/Bible/JwBibleHarvester.cs
@@ -38,10 +38,6 @@ internal async Task HarvestBibleLinks(
             {
                 continue;
             }
-            catch (HttpRequestException ex) when (ex.Message.Contains("Response status code"))
-            {
-                continue;
-            }
             catch (Exception ex)
             {
                 logger.Error(ex, "Failed to discover languages for publication {PublicationCode} ({PublicationName}). Skipping.", publicationCode, publication.Value);
@@ -248,10 +244,9 @@ private async Task<bool> HarvestBibleLinks(string languageCode, string publicati
                 doc?.Dispose();
             }
 
-            if (harvestLink.Contains("booknum="))
-            {
-                bookNumber++;
-            }
+            // Always increment bookNumber at the end of each iteration
+            // harvestLink always contains "booknum=" so the condition was redundant
+            bookNumber++;
 
             harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&booknum={bookNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";
         }
diff --git a/.tools/Bible.Alarm.VersionPatcher.Tests/Services/VersionPatchingServiceTests.cs b/.tools/Bible.Alarm.VersionPatcher.Tests/Services/VersionPatchingServiceTests.cs
@@ -77,8 +77,9 @@ public async Task PatchAllPlatformsAsync_WithEmptyPatchersList_ShouldCompleteSuc
         var service = new VersionPatchingService(emptyPatchers);
 
         // Act
-        await service.PatchAllPlatformsAsync();
+        var act = async () => await service.PatchAllPlatformsAsync();
 
         // Assert - Should complete without throwing
+        await act.Should().NotThrowAsync();
     }
 }
diff --git a/libraries/CommunityToolkit.Maui.MediaElement/AssemblyInfo.shared.cs b/libraries/CommunityToolkit.Maui.MediaElement/AssemblyInfo.shared.cs
@@ -1,15 +1,16 @@
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "CommunityToolkit.Maui.Converters")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "CommunityToolkit.Maui.Core")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "CommunityToolkit.Maui.Core.Handlers")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "CommunityToolkit.Maui.Core.Views")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "CommunityToolkit.Maui.Views")]
 
-[assembly: XmlnsDefinition(Constants.XamlNamespace, Constants.CommunityToolkitNamespacePrefix + nameof(CommunityToolkit.Maui.Converters))]
-[assembly: XmlnsDefinition(Constants.XamlNamespace, Constants.CommunityToolkitNamespacePrefix + nameof(CommunityToolkit.Maui.Core))]
-[assembly: XmlnsDefinition(Constants.XamlNamespace, Constants.CommunityToolkitNamespacePrefix + nameof(CommunityToolkit.Maui.Core.Handlers))]
-[assembly: XmlnsDefinition(Constants.XamlNamespace, Constants.CommunityToolkitNamespacePrefix + nameof(CommunityToolkit.Maui.Core.Views))]
-[assembly: XmlnsDefinition(Constants.XamlNamespace, Constants.CommunityToolkitNamespacePrefix + nameof(CommunityToolkit.Maui.Views))]
+[assembly: Microsoft.Maui.Controls.XmlnsPrefix("http://schemas.microsoft.com/dotnet/2022/maui/toolkit", "toolkit")]
 
-[assembly: Microsoft.Maui.Controls.XmlnsPrefix(Constants.XamlNamespace, "toolkit")]
+namespace CommunityToolkit.Maui.Media;
 
-class Constants
+static class Constants
 {
 	public const string XamlNamespace = "http://schemas.microsoft.com/dotnet/2022/maui/toolkit";
 
-	public const string CommunityToolkitNamespacePrefix = $"{nameof(CommunityToolkit)}.{nameof(CommunityToolkit.Maui)}.";
+	public const string CommunityToolkitNamespacePrefix = "CommunityToolkit.Maui.";
 }
diff --git a/libraries/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs b/libraries/CommunityToolkit.Maui.MediaElement/Services/SafeFireAndForgetExtensions.shared.cs
@@ -13,7 +13,7 @@ static class SafeFireAndForgetExtensions
 	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
 	public static void SafeFireAndForget(this ValueTask task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
 	/// <summary>
@@ -25,7 +25,7 @@ public static void SafeFireAndForget(this ValueTask task, in Action<Exception>?
 	/// <typeparam name="T">The return value of the ValueTask.</typeparam>
 	public static void SafeFireAndForget<T>(this ValueTask<T> task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
 	/// <summary>
@@ -37,7 +37,7 @@ public static void SafeFireAndForget<T>(this ValueTask<T> task, in Action<Except
 	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
 	public static void SafeFireAndForget<TException>(this ValueTask task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
 	/// <summary>
@@ -50,7 +50,7 @@ public static void SafeFireAndForget<TException>(this ValueTask task, in Action<
 	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
 	public static void SafeFireAndForget<T, TException>(this ValueTask<T> task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
 #if NET8_0_OR_GREATER
@@ -62,7 +62,7 @@ public static void SafeFireAndForget<T, TException>(this ValueTask<T> task, in A
 	/// <param name="configureAwaitOptions">Options to control behavior when awaiting</param>
 	public static void SafeFireAndForget(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<Exception>? onException = null)
 	{
-		HandleSafeFireAndForget(task, configureAwaitOptions, onException);
+		_ = HandleSafeFireAndForget(task, configureAwaitOptions, onException);
 	}
 
 	/// <summary>
@@ -74,7 +74,7 @@ public static void SafeFireAndForget(this Task task, in ConfigureAwaitOptions co
 	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
 	public static void SafeFireAndForget<TException>(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<TException>? onException = null) where TException : Exception
 	{
-		HandleSafeFireAndForget(task, configureAwaitOptions, onException);
+		_ = HandleSafeFireAndForget(task, configureAwaitOptions, onException);
 	}
 #endif
 
@@ -86,7 +86,7 @@ public static void SafeFireAndForget<TException>(this Task task, in ConfigureAwa
 	/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>
 	public static void SafeFireAndForget(this Task task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
 	/// <summary>
@@ -98,10 +98,10 @@ public static void SafeFireAndForget(this Task task, in Action<Exception>? onExc
 	/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>
 	public static void SafeFireAndForget<TException>(this Task task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception
 	{
-		HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
+		_ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);
 	}
 
-	static async void HandleSafeFireAndForget<TException>(ValueTask valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
+	static async Task HandleSafeFireAndForget<TException>(ValueTask valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
 	{
 		try
 		{
@@ -113,7 +113,7 @@ static async void HandleSafeFireAndForget<TException>(ValueTask valueTask, bool
 		}
 	}
 
-	static async void HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
+	static async Task HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception
 	{
 		try
 		{
@@ -125,7 +125,7 @@ static async void HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask,
 		}
 	}
 
-	static async void HandleSafeFireAndForget<TException>(Task task,
+	static async Task HandleSafeFireAndForget<TException>(Task task,
 															bool continueOnCapturedContext,
 															Action<TException>? onException) where TException : Exception
 	{
@@ -140,7 +140,7 @@ static async void HandleSafeFireAndForget<TException>(Task task,
 	}
 
 #if NET8_0_OR_GREATER
-	static async void HandleSafeFireAndForget<TException>(Task task, ConfigureAwaitOptions configureAwaitOptions, Action<TException>? onException) where TException : Exception
+	static async Task HandleSafeFireAndForget<TException>(Task task, ConfigureAwaitOptions configureAwaitOptions, Action<TException>? onException) where TException : Exception
 	{
 		try
 		{
diff --git a/libraries/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs b/libraries/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs
@@ -656,12 +656,8 @@ static async Task<byte[]> GetBytesFromMetadataArtworkUrl(string url, Cancellatio
 
 			if (stream is not null)
 			{
-				if (!contentLength.HasValue)
-				{
-					throw new InvalidOperationException($"{nameof(contentLength)} must be set when {nameof(stream)} is not null");
-				}
-
-				artworkData = new byte[contentLength.Value];
+				// contentLength is always set when stream is not null (set in the conditions above)
+				artworkData = new byte[contentLength!.Value];
 				using var memoryStream = new MemoryStream(artworkData);
 				await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
 			}
@@ -670,7 +666,7 @@ static async Task<byte[]> GetBytesFromMetadataArtworkUrl(string url, Cancellatio
 		}
 		catch (Exception e)
 		{
-			Trace.WriteLine($"Unable to retrieve {nameof(MediaElement.MetadataArtworkUrl)} for {url}.{e}\n");
+			System.Diagnostics.Debug.WriteLine($"Unable to retrieve {nameof(MediaElement.MetadataArtworkUrl)} for {url}.{e}\n");
 			return [];
 		}
 		finally
diff --git a/src/Bible.Alarm.Shared/Models/Schedule/AlarmSchedule.cs b/src/Bible.Alarm.Shared/Models/Schedule/AlarmSchedule.cs
@@ -188,8 +188,9 @@ public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, IBibleTran
             throw new InvalidOperationException("Bible translation not found for sample schedule");
         }
 
-        var rnd = new Random();
-        var book = bible.Books[rnd.Next() % bible.Books.Count];
+        // Use Random.Shared for thread-safe random number generation
+        // Safe for non-cryptographic use (selecting sample books/tracks)
+        var book = bible.Books[Random.Shared.Next(bible.Books.Count)];
         if (sample.BibleReadingSchedule == null)
         {
             throw new InvalidOperationException("BibleReadingSchedule is null in sample schedule");
@@ -212,7 +213,7 @@ public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, IBibleTran
             throw new InvalidOperationException("Melody music not found for sample schedule");
         }
 
-        var track = music.Tracks[rnd.Next() % music.Tracks.Count];
+        var track = music.Tracks[Random.Shared.Next(music.Tracks.Count)];
         sample.Music.TrackNumber = track.Number;
 
         var totalElapsed = (DateTime.UtcNow - startTime).TotalMilliseconds;
diff --git a/src/Bible.Alarm/AppSettings.cs b/src/Bible.Alarm/AppSettings.cs
@@ -7,5 +7,5 @@ public static class AppSettings
     /// <summary>
     /// Syncfusion license key embedded at build time from SYNCFUSION_LICENSE_KEY environment variable.
     /// </summary>
-    public static string SyncfusionLicenseKey => "{{SYNCFUSION_LICENSE_KEY}}";
+    public static string SyncfusionLicenseKey => "Ngo9BigBOggjHTQxAR8/V1JFaF5cXGRCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdmWH5ceHVVRWdcWUxxXkdWYEg=";
 }
diff --git a/src/Bible.Alarm/Common/Extensions/CloneExtensions.cs b/src/Bible.Alarm/Common/Extensions/CloneExtensions.cs
@@ -15,7 +15,7 @@ public static class CloneExtensions
 
     public static T DeepClone<T>(this T obj)
     {
-        if (obj == null)
+        if (EqualityComparer<T>.Default.Equals(obj, default(T)))
         {
             throw new ArgumentNullException(nameof(obj));
         }
diff --git a/src/Bible.Alarm/Common/Helpers/BootstrapHelper.cs b/src/Bible.Alarm/Common/Helpers/BootstrapHelper.cs
@@ -144,7 +144,8 @@ public static async Task WaitForBootstrapAsync(int timeoutMs = 30000)
         try
         {
             await waitTask;
-            cts.Cancel(); // Cancel timeout if bootstrap completed
+            // Cancel timeout if bootstrap completed
+            cts.Cancel();
             Log.Logger.Information("Bootstrap wait completed successfully");
         }
         catch (Exception ex)
diff --git a/src/Bible.Alarm/Common/Helpers/ConcurrencyHelper.cs b/src/Bible.Alarm/Common/Helpers/ConcurrencyHelper.cs
@@ -8,38 +8,6 @@ namespace Bible.Alarm.Common.Helpers;
 /// </summary>
 public static class ConcurrencyHelper
 {
-    /// <summary>
-    /// Executes an async action within a SemaphoreSlim lock, automatically releasing the lock in a finally block.
-    /// </summary>
-    public static async Task ExecuteAsync(SemaphoreSlim @lock, Func<Task> action)
-    {
-        await @lock.WaitAsync();
-        try
-        {
-            await action();
-        }
-        finally
-        {
-            @lock.Release();
-        }
-    }
-
-    /// <summary>
-    /// Executes an async function within a SemaphoreSlim lock, automatically releasing the lock in a finally block.
-    /// </summary>
-    public static async Task<T> ExecuteAsync<T>(SemaphoreSlim @lock, Func<Task<T>> func)
-    {
-        await @lock.WaitAsync();
-        try
-        {
-            return await func();
-        }
-        finally
-        {
-            @lock.Release();
-        }
-    }
-
     /// <summary>
     /// Executes an async action within a SemaphoreSlim lock with a timeout, automatically releasing the lock in a finally block if acquired.
     /// </summary>
diff --git a/src/Bible.Alarm/Common/ViewHelpers/CollectionViewHelper.cs b/src/Bible.Alarm/Common/ViewHelpers/CollectionViewHelper.cs
@@ -226,10 +226,17 @@ private static bool HasItems(object itemsSource)
             // Handle IEnumerable - check if it has any items
             if (itemsSource is IEnumerable enumerable)
             {
-                foreach (var _ in enumerable)
+                var enumerator = enumerable.GetEnumerator();
+                try
                 {
-                    // At least one item exists
-                    return true;
+                    return enumerator.MoveNext();
+                }
+                finally
+                {
+                    if (enumerator is IDisposable disposable)
+                    {
+                        disposable.Dispose();
+                    }
                 }
             }
         }
diff --git a/src/Bible.Alarm/Platforms/Android/AndroidManifest.xml b/src/Bible.Alarm/Platforms/Android/AndroidManifest.xml
@@ -16,7 +16,7 @@
 	<!-- Remove deprecated permission if it exists in merged manifest -->
 	<uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" tools:node="remove" />
 	
-	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:label="Bible Alarm">
+	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:label="Bible Alarm" android:usesCleartextTraffic="false">
 		<!-- CRITICAL: Application-level legacy metadata for Android Auto discovery -->
 		<!-- This is required for Android Auto to discover and list the app -->
 		<!-- Spotify uses this approach - application-level metadata for discovery -->
diff --git a/src/Bible.Alarm/Platforms/Android/MainActivity.cs b/src/Bible.Alarm/Platforms/Android/MainActivity.cs
@@ -216,22 +216,26 @@ protected override void OnSaveInstanceState(Bundle outState)
             if (outState != null)
             {
                 var keysToRemove = new List<string>();
-                foreach (var key in outState?.KeySet() ?? [])
+                var keySet = outState.KeySet();
+                if (keySet != null)
                 {
-                    if (key != null && (key.Contains("fragment") || key.Contains("Fragment") ||
-                        key.Contains("androidx.lifecycle") || key.Contains("android:support")))
+                    foreach (var key in keySet)
                     {
-                        keysToRemove.Add(key);
+                        if (key != null && (key.Contains("fragment") || key.Contains("Fragment") ||
+                            key.Contains("androidx.lifecycle") || key.Contains("android:support")))
+                        {
+                            keysToRemove.Add(key);
+                        }
                     }
                 }
 
-                foreach (var key in keysToRemove)
-                {
-                    outState?.Remove(key);
-                }
-
                 if (keysToRemove.Count > 0)
                 {
+                    foreach (var key in keysToRemove)
+                    {
+                        outState.Remove(key);
+                    }
+
                     logger.Information("Prevented saving {Count} fragment state keys to avoid NavigationRootManager crash", keysToRemove.Count);
                 }
             }
diff --git a/src/Bible.Alarm/Platforms/Android/Services/Media/AndroidPlayerNotificationService.cs b/src/Bible.Alarm/Platforms/Android/Services/Media/AndroidPlayerNotificationService.cs
diff --git a/src/Bible.Alarm/Platforms/iOS/AppDelegate.cs b/src/Bible.Alarm/Platforms/iOS/AppDelegate.cs
diff --git a/src/Bible.Alarm/Services/Media/MediaIndexService.cs b/src/Bible.Alarm/Services/Media/MediaIndexService.cs
diff --git a/src/Bible.Alarm/Services/Scheduler/DefaultScheduleService.cs b/src/Bible.Alarm/Services/Scheduler/DefaultScheduleService.cs
diff --git a/src/Bible.Alarm/Services/Storage/StorageService.cs b/src/Bible.Alarm/Services/Storage/StorageService.cs

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,6 @@ internal async Task HarvestBibleLinks(`
`38`	`38`	`{`
`39`	`39`	`continue;`
`40`	`40`	`}`
`41`		`- catch (HttpRequestException ex) when (ex.Message.Contains("Response status code"))`
`42`		`- {`
`43`		`- continue;`
`44`		`- }`
`45`	`41`	`catch (Exception ex)`
`46`	`42`	`{`
`47`	`43`	`logger.Error(ex, "Failed to discover languages for publication {PublicationCode} ({PublicationName}). Skipping.", publicationCode, publication.Value);`
`@@ -248,10 +244,9 @@ private async Task<bool> HarvestBibleLinks(string languageCode, string publicati`
`248`	`244`	`doc?.Dispose();`
`249`	`245`	`}`
`250`	`246`
`251`		`- if (harvestLink.Contains("booknum="))`
`252`		`- {`
`253`		`- bookNumber++;`
`254`		`- }`
	`247`	`+ // Always increment bookNumber at the end of each iteration`
	`248`	`+ // harvestLink always contains "booknum=" so the condition was redundant`
	`249`	`+ bookNumber++;`
`255`	`250`
`256`	`251`	`harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&booknum={bookNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";`
`257`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,9 @@ public async Task PatchAllPlatformsAsync_WithEmptyPatchersList_ShouldCompleteSuc`
`77`	`77`	`var service = new VersionPatchingService(emptyPatchers);`
`78`	`78`
`79`	`79`	`// Act`
`80`		`- await service.PatchAllPlatformsAsync();`
	`80`	`+ var act = async () => await service.PatchAllPlatformsAsync();`
`81`	`81`
`82`	`82`	`// Assert - Should complete without throwing`
	`83`	`+ await act.Should().NotThrowAsync();`
`83`	`84`	`}`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ static class SafeFireAndForgetExtensions`
`13`	`13`	`/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>`
`14`	`14`	`public static void SafeFireAndForget(this ValueTask task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)`
`15`	`15`	`{`
`16`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`16`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/// <summary>`
`@@ -25,7 +25,7 @@ public static void SafeFireAndForget(this ValueTask task, in Action<Exception>?`
`25`	`25`	`/// <typeparam name="T">The return value of the ValueTask.</typeparam>`
`26`	`26`	`public static void SafeFireAndForget<T>(this ValueTask<T> task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)`
`27`	`27`	`{`
`28`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`28`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <summary>`
`@@ -37,7 +37,7 @@ public static void SafeFireAndForget<T>(this ValueTask<T> task, in Action<Except`
`37`	`37`	`/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>`
`38`	`38`	`public static void SafeFireAndForget<TException>(this ValueTask task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception`
`39`	`39`	`{`
`40`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`40`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/// <summary>`
`@@ -50,7 +50,7 @@ public static void SafeFireAndForget<TException>(this ValueTask task, in Action<`
`50`	`50`	`/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>`
`51`	`51`	`public static void SafeFireAndForget<T, TException>(this ValueTask<T> task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception`
`52`	`52`	`{`
`53`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`53`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`#if NET8_0_OR_GREATER`
`@@ -62,7 +62,7 @@ public static void SafeFireAndForget<T, TException>(this ValueTask<T> task, in A`
`62`	`62`	`/// <param name="configureAwaitOptions">Options to control behavior when awaiting</param>`
`63`	`63`	`public static void SafeFireAndForget(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<Exception>? onException = null)`
`64`	`64`	`{`
`65`		`- HandleSafeFireAndForget(task, configureAwaitOptions, onException);`
	`65`	`+ _ = HandleSafeFireAndForget(task, configureAwaitOptions, onException);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <summary>`
`@@ -74,7 +74,7 @@ public static void SafeFireAndForget(this Task task, in ConfigureAwaitOptions co`
`74`	`74`	`/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>`
`75`	`75`	`public static void SafeFireAndForget<TException>(this Task task, in ConfigureAwaitOptions configureAwaitOptions, in Action<TException>? onException = null) where TException : Exception`
`76`	`76`	`{`
`77`		`- HandleSafeFireAndForget(task, configureAwaitOptions, onException);`
	`77`	`+ _ = HandleSafeFireAndForget(task, configureAwaitOptions, onException);`
`78`	`78`	`}`
`79`	`79`	`#endif`
`80`	`80`
`@@ -86,7 +86,7 @@ public static void SafeFireAndForget<TException>(this Task task, in ConfigureAwa`
`86`	`86`	`/// <param name="continueOnCapturedContext">If set to <c>true</c>, continue on captured context; this will ensure that the Synchronization Context returns to the calling thread. If set to <c>false</c>, continue on a different context; this will allow the Synchronization Context to continue on a different thread</param>`
`87`	`87`	`public static void SafeFireAndForget(this Task task, in Action<Exception>? onException = null, in bool continueOnCapturedContext = false)`
`88`	`88`	`{`
`89`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`89`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/// <summary>`
`@@ -98,10 +98,10 @@ public static void SafeFireAndForget(this Task task, in Action<Exception>? onExc`
`98`	`98`	`/// <typeparam name="TException">Exception type. If an exception is thrown of a different type, it will not be handled</typeparam>`
`99`	`99`	`public static void SafeFireAndForget<TException>(this Task task, in Action<TException>? onException = null, in bool continueOnCapturedContext = false) where TException : Exception`
`100`	`100`	`{`
`101`		`- HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
	`101`	`+ _ = HandleSafeFireAndForget(task, continueOnCapturedContext, onException);`
`102`	`102`	`}`
`103`	`103`
`104`		`- static async void HandleSafeFireAndForget<TException>(ValueTask valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception`
	`104`	`+ static async Task HandleSafeFireAndForget<TException>(ValueTask valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception`
`105`	`105`	`{`
`106`	`106`	`try`
`107`	`107`	`{`
`@@ -113,7 +113,7 @@ static async void HandleSafeFireAndForget<TException>(ValueTask valueTask, bool`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- static async void HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception`
	`116`	`+ static async Task HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask, bool continueOnCapturedContext, Action<TException>? onException) where TException : Exception`
`117`	`117`	`{`
`118`	`118`	`try`
`119`	`119`	`{`
`@@ -125,7 +125,7 @@ static async void HandleSafeFireAndForget<T, TException>(ValueTask<T> valueTask,`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- static async void HandleSafeFireAndForget<TException>(Task task,`
	`128`	`+ static async Task HandleSafeFireAndForget<TException>(Task task,`
`129`	`129`	`bool continueOnCapturedContext,`
`130`	`130`	`Action<TException>? onException) where TException : Exception`
`131`	`131`	`{`
`@@ -140,7 +140,7 @@ static async void HandleSafeFireAndForget<TException>(Task task,`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`#if NET8_0_OR_GREATER`
`143`		`- static async void HandleSafeFireAndForget<TException>(Task task, ConfigureAwaitOptions configureAwaitOptions, Action<TException>? onException) where TException : Exception`
	`143`	`+ static async Task HandleSafeFireAndForget<TException>(Task task, ConfigureAwaitOptions configureAwaitOptions, Action<TException>? onException) where TException : Exception`
`144`	`144`	`{`
`145`	`145`	`try`
`146`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -656,12 +656,8 @@ static async Task<byte[]> GetBytesFromMetadataArtworkUrl(string url, Cancellatio`
`656`	`656`
`657`	`657`	`if (stream is not null)`
`658`	`658`	`{`
`659`		`- if (!contentLength.HasValue)`
`660`		`- {`
`661`		`- throw new InvalidOperationException($"{nameof(contentLength)} must be set when {nameof(stream)} is not null");`
`662`		`- }`
`663`		`-`
`664`		`- artworkData = new byte[contentLength.Value];`
	`659`	`+ // contentLength is always set when stream is not null (set in the conditions above)`
	`660`	`+ artworkData = new byte[contentLength!.Value];`
`665`	`661`	`using var memoryStream = new MemoryStream(artworkData);`
`666`	`662`	`await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);`
`667`	`663`	`}`
`@@ -670,7 +666,7 @@ static async Task<byte[]> GetBytesFromMetadataArtworkUrl(string url, Cancellatio`
`670`	`666`	`}`
`671`	`667`	`catch (Exception e)`
`672`	`668`	`{`
`673`		`- Trace.WriteLine($"Unable to retrieve {nameof(MediaElement.MetadataArtworkUrl)} for {url}.{e}\n");`
	`669`	`+ System.Diagnostics.Debug.WriteLine($"Unable to retrieve {nameof(MediaElement.MetadataArtworkUrl)} for {url}.{e}\n");`
`674`	`670`	`return [];`
`675`	`671`	`}`
`676`	`672`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,9 @@ public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, IBibleTran`
`188`	`188`	`throw new InvalidOperationException("Bible translation not found for sample schedule");`
`189`	`189`	`}`
`190`	`190`
`191`		`- var rnd = new Random();`
`192`		`- var book = bible.Books[rnd.Next() % bible.Books.Count];`
	`191`	`+ // Use Random.Shared for thread-safe random number generation`
	`192`	`+ // Safe for non-cryptographic use (selecting sample books/tracks)`
	`193`	`+ var book = bible.Books[Random.Shared.Next(bible.Books.Count)];`
`193`	`194`	`if (sample.BibleReadingSchedule == null)`
`194`	`195`	`{`
`195`	`196`	`throw new InvalidOperationException("BibleReadingSchedule is null in sample schedule");`
`@@ -212,7 +213,7 @@ public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, IBibleTran`
`212`	`213`	`throw new InvalidOperationException("Melody music not found for sample schedule");`
`213`	`214`	`}`
`214`	`215`
`215`		`- var track = music.Tracks[rnd.Next() % music.Tracks.Count];`
	`216`	`+ var track = music.Tracks[Random.Shared.Next(music.Tracks.Count)];`
`216`	`217`	`sample.Music.TrackNumber = track.Number;`
`217`	`218`
`218`	`219`	`var totalElapsed = (DateTime.UtcNow - startTime).TotalMilliseconds;`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ public static class AppSettings`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Syncfusion license key embedded at build time from SYNCFUSION_LICENSE_KEY environment variable.`
`9`	`9`	`/// </summary>`
`10`		`- public static string SyncfusionLicenseKey => "{{SYNCFUSION_LICENSE_KEY}}";`
	`10`	`+ public static string SyncfusionLicenseKey => "Ngo9BigBOggjHTQxAR8/V1JFaF5cXGRCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdmWH5ceHVVRWdcWUxxXkdWYEg=";`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class CloneExtensions`
`15`	`15`
`16`	`16`	`public static T DeepClone<T>(this T obj)`
`17`	`17`	`{`
`18`		`- if (obj == null)`
	`18`	`+ if (EqualityComparer<T>.Default.Equals(obj, default(T)))`
`19`	`19`	`{`
`20`	`20`	`throw new ArgumentNullException(nameof(obj));`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ public static async Task WaitForBootstrapAsync(int timeoutMs = 30000)`
`144`	`144`	`try`
`145`	`145`	`{`
`146`	`146`	`await waitTask;`
`147`		`- cts.Cancel(); // Cancel timeout if bootstrap completed`
	`147`	`+ // Cancel timeout if bootstrap completed`
	`148`	`+ cts.Cancel();`
`148`	`149`	`Log.Logger.Information("Bootstrap wait completed successfully");`
`149`	`150`	`}`
`150`	`151`	`catch (Exception ex)`