diff --git a/Directory.Packages.props b/Directory.Packages.props index 10c4abbf7..541c00886 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -84,6 +84,7 @@ + diff --git a/src/ST.Client.Android/Services/Implementation/PlatformHttpMessageHandlerBuilder.cs b/src/ST.Client.Android/Services/Implementation/PlatformHttpMessageHandlerBuilder.cs index a4b7c08d3..4cdbc9467 100644 --- a/src/ST.Client.Android/Services/Implementation/PlatformHttpMessageHandlerBuilder.cs +++ b/src/ST.Client.Android/Services/Implementation/PlatformHttpMessageHandlerBuilder.cs @@ -14,10 +14,10 @@ namespace System.Application.Services.Implementation #endif } - public static AndroidClientHandler CreateAndroidClientHandler() + public static AndroidClientHandler CreateAndroidClientHandler(AndroidClientHandler? handler = null) { // https://docs.microsoft.com/zh-cn/xamarin/android/app-fundamentals/http-stack?context=xamarin%2Fcross-platform&tabs=macos - var handler = new AndroidClientHandler(); + handler ??= new AndroidClientHandler(); AddFiddlerRootCertificate(handler); GeneralHttpClientFactory.SetProxyToHandler(GeneralHttpClientFactory.DefaultProxy, handler); return handler; diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_General.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_General.axaml index 5e36e3fb5..5de51b32f 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_General.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_General.axaml @@ -69,6 +69,18 @@ + + + + + + + + + + +