[Sample App] Add Microsoft.Extensions.Http.Resilience (#1643)

Add Microsoft.Extensions.Http.Resilience

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

@@ -54,7 +54,7 @@
 
     <PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
   </ItemGroup>
 

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -25,6 +25,7 @@
 using CommunityToolkit.Maui.Sample.ViewModels.Views.AvatarView;
 using CommunityToolkit.Maui.Sample.Views.Popups;
 using CommunityToolkit.Maui.Storage;
+using Microsoft.Extensions.Http.Resilience;
 using Microsoft.Extensions.Logging;
 using Polly;
 
@@ -57,7 +58,7 @@ public static MauiApp CreateMauiApp()
 								});
 
 		builder.Services.AddHttpClient<ByteArrayToImageSourceConverterViewModel>()
-						.AddTransientHttpErrorPolicy(policyBuilder => policyBuilder.WaitAndRetryAsync(3, SleepDurationProvider));
+						.AddStandardResilienceHandler(options => options.Retry = new MobileHttpRetryStrategyOptions());
 
 		builder.Services.AddSingleton<PopupSizeConstants>();
 
@@ -69,8 +70,6 @@ public static MauiApp CreateMauiApp()
 #endif
 
 		return builder.Build();
-
-		static TimeSpan SleepDurationProvider(int attemptNumber) => TimeSpan.FromSeconds(Math.Pow(2, attemptNumber));
 	}
 
 	static void RegisterViewsAndViewModels(in IServiceCollection services)
@@ -216,4 +215,15 @@ static IServiceCollection AddTransientWithShellRoute<TPage, TViewModel>(this ISe
 	{
 		return services.AddTransientWithShellRoute<TPage, TViewModel>(AppShell.GetPageRoute<TViewModel>());
 	}
+
+	sealed class MobileHttpRetryStrategyOptions : HttpRetryStrategyOptions
+	{
+		public MobileHttpRetryStrategyOptions()
+		{
+			BackoffType = DelayBackoffType.Exponential;
+			MaxRetryAttempts = 3;
+			UseJitter = true;
+			Delay = TimeSpan.FromSeconds(2);
+		}
+	}
 }

samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/IconTintColorBehaviorViewModel.cs

@@ -10,7 +10,7 @@ public partial class IconTintColorBehaviorViewModel : BaseViewModel
 
 	static readonly IEnumerator<Color?> toggleableColorsEnumerator = new List<Color?> { Colors.Red, Colors.Green, null }.GetEnumerator();
 
-	[ObservableProperty] 
+	[ObservableProperty]
 	string toggleableImageSource = shieldImageFileName;
 
 	[ObservableProperty]
@@ -36,6 +36,6 @@ void ChangeColor()
 			toggleableColorsEnumerator.MoveNext();
 		}
 
-		ToggleableIconTintColor =  toggleableColorsEnumerator.Current;
+		ToggleableIconTintColor = toggleableColorsEnumerator.Current;
 	}
 }

src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.ios.cs

@@ -22,7 +22,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 
 		audioEngine = new AVAudioEngine();
 		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest();
-		
+
 		InitializeAvAudioSession(out _);
 
 		var node = audioEngine.InputNode;

src/CommunityToolkit.Maui.Core/Essentials/SpeechToText/SpeechToTextImplementation.macos.cs

@@ -22,7 +22,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 
 		audioEngine = new AVAudioEngine();
 		liveSpeechRequest = new SFSpeechAudioBufferRecognitionRequest();
-		
+
 		InitializeAvAudioSession(out var audioSession);
 
 		var mode = audioSession.AvailableModes.Contains(AVAudioSession.ModeMeasurement)
@@ -52,7 +52,7 @@ Task InternalStartListeningAsync(CultureInfo culture, CancellationToken cancella
 		{
 			throw new Exception(error.LocalizedDescription);
 		}
-		
+
 		cancellationToken.ThrowIfCancellationRequested();
 
 		var currentIndex = 0;

src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.macios.cs

@@ -83,7 +83,7 @@ public static ValueTask<Stream> GetImageStream(IList<PointF> points, Size imageS
 		{
 			throw new InvalidOperationException("Unable to generate image. No Lines Found");
 		}
-		
+
 		return GetUIImage(points, (context, offset) =>
 		{
 			foreach (var line in lines)

src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs

@@ -63,7 +63,7 @@ public override void ViewDidDisappear(bool animated)
 			overlayView.RemoveFromSuperview();
 			overlayView.Dispose();
 		}
-		
+
 		base.ViewDidDisappear(animated);
 	}
 

src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs

@@ -115,7 +115,7 @@ or PlaybackStateCompat.StateSkippingToQueueItem
 		if (playbackState is IPlayer.StateReady)
 		{
 			MediaElement.Duration = TimeSpan.FromMilliseconds(Player.Duration < 0 ? 0 : Player.Duration);
-			MediaElement.Position = TimeSpan.FromMilliseconds(Player.CurrentPosition < 0 ? 0: Player.CurrentPosition);
+			MediaElement.Position = TimeSpan.FromMilliseconds(Player.CurrentPosition < 0 ? 0 : Player.CurrentPosition);
 		}
 	}
 

src/CommunityToolkit.Maui/Behaviors/AnimationBehavior.shared.cs

@@ -26,8 +26,8 @@ public class AnimationBehavior : EventToCommandBehavior
 	/// Gets the Command that allows the triggering of the animation.
 	/// </summary>
 	/// <remarks>
- 	/// <see cref="AnimateCommand"/> has a <see cref="Type"/> of Command&lt;CancellationToken&gt; which requires a <see cref="CancellationToken"/> as a CommandParameter. See <see cref="Command{CancellationToken}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="CancellationToken"/> into <see cref="Command{T}"/> as a CommandParameter"
- 	/// </remarks>
+	/// <see cref="AnimateCommand"/> has a <see cref="Type"/> of Command&lt;CancellationToken&gt; which requires a <see cref="CancellationToken"/> as a CommandParameter. See <see cref="Command{CancellationToken}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="CancellationToken"/> into <see cref="Command{T}"/> as a CommandParameter"
+	/// </remarks>
 	public Command<CancellationToken> AnimateCommand => (Command<CancellationToken>)GetValue(AnimateCommandProperty);
 
 	/// <summary>

src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs

@@ -250,7 +250,7 @@ public IList<string> StyleClass
 
 	/// <inheritdoc/>
 	TaskCompletionSource IAsynchronousHandler.HandlerCompleteTCS => popupDismissedTaskCompletionSource;
-	
+
 	/// <inheritdoc/>
 	bool IResourcesProvider.IsResourcesCreated => resources is not null;