Remove the obsolete AndroidClientHandler class by simonrozsival · Pull Request #11393 · dotnet/android

simonrozsival · 2026-05-18T15:02:21Z

This PR removes the obsolete AndroidClientHandler class and leaves just the AndroidMessageHandler class as the native http handler. The $(AndroidHttpClientHandlerType) property and the XA_HTTP_CLIENT_HANDLER_TYPE environment variable are now ignored.

Copilot

Pull request overview

Removes the deprecated Xamarin.Android.Net.AndroidClientHandler class so only AndroidMessageHandler remains as the native HTTP handler. The $(AndroidHttpClientHandlerType) MSBuild property and the XA_HTTP_CLIENT_HANDLER_TYPE environment variable are now ignored (with the property producing a build error if set), and the related MSBuild plumbing, error codes (XA1031/XA1032/XA1033), runtime selection logic, docs, and tests are deleted. A small unrelated tweak in AndroidMessageHandler.HandleRedirect short-circuits cross-scheme redirects to let the client decide.

Changes:

Delete AndroidClientHandler (and its .Legacy.cs), update public API baselines on API-35/36/36.1/37, and add API-compat acceptable-breakages entries.
Remove CheckClientHandlerType task, XA1031/1032/1033 resources/docs, HttpClientHandlerType task properties, XA_HTTP_CLIENT_HANDLER_TYPE env injection, AndroidEnvironment.GetHttpMessageHandler selection logic, and related tests.
Refactor _CheckAndroidHttpClientHandlerType target to emit an MSBuild <Error/> when the property is set; add cross-scheme redirect handling in AndroidMessageHandler; split HttpClientIntegrationTests into a single AndroidMessageHandlerIntegrationTests fixture.

Reviewed changes

Copilot reviewed 44 out of 46 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs, AndroidClientHandler.Legacy.cs	Delete the deprecated wrapper and its legacy implementation
src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs	Drop unused `*Internal` shims; add cross-scheme redirect short-circuit
src/Mono.Android/Android.Runtime/AndroidEnvironment.cs	Replace `XA_HTTP_CLIENT_HANDLER_TYPE`-based selection with a hard-coded `new AndroidMessageHandler()`
src/Mono.Android/Mono.Android.csproj	Drop `AndroidClientHandler.cs` from compilation
src/Mono.Android/PublicAPI/API-3{5,6,6.1,7}/PublicAPI.{Shipped,Unshipped}.txt	Move `AndroidClientHandler` API surface to `REMOVED`
src/Microsoft.Android.Sdk.ILLink/MarkJavaObjects.cs	Remove custom HTTP handler preservation logic
src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets	Drop `CheckClientHandlerType` UsingTask; replace check target body with an `<Error/>`; stop forwarding `HttpClientHandlerType`
src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/*.targets	Drop `HttpClientHandlerType` parameter wiring and the default `AndroidHttpClientHandlerType` / `UseNativeHttpHandler` derivation
src/Xamarin.Android.Build.Tasks/Tasks/CheckClientHandlerType.cs	Remove obsolete task
src/Xamarin.Android.Build.Tasks/Tasks/Generate*Sources.cs	Drop `HttpClientHandlerType` task property and threading through `AddDefaultEnvironmentVariables`
src/Xamarin.Android.Build.Tasks/Utilities/Environment{Builder,FilesParser}.cs	Remove `AddHttpClientHandlerType`/`HaveHttpMessageHandler` plumbing
src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs	Remove XA1031/XA1031_HCH/XA1032/XA1033 accessors
src/Xamarin.Android.Build.Tasks/Tests/.../CheckClientHandlerTypeTests.cs, LinkerTests.cs, EnvironmentContentTests.cs	Delete tests that exercised the removed plumbing
src/profiled-aot/dotnet.aotprofile.txt	Drop `IsAcceptableHttpMessageHandlerType` entry
tests/api-compatibility/acceptable-breakages-vReference-net11.0.txt	Empty out the compat exception list (now reset to just the header)
tests/Mono.Android-Tests/.../{HttpClientIntegrationTests.cs,AndroidClientHandlerTests.cs,Android.Runtime/AndroidEnvironmentTest.cs}	Remove handler-agnostic integration tests and AndroidEnvironment unit test
tests/Mono.Android-Tests/.../AndroidMessageHandlerIntegrationTests.cs	New consolidated integration test fixture targeting only `AndroidMessageHandler`
tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj	Update compile list and remove `AndroidClientHandler` category from exclusions
tests/Mono.Android-Tests/Mono.Android-Tests/TrimmerRoots.xml	Stop preserving `AndroidClientHandler`
Documentation/docs-mobile/{messages/{xa1031,xa1032,xa1033}.md,index.md,TOC.yml,building-apps/build-properties.md}	Remove docs for retired error codes and the `AndroidHttpClientHandlerType` property
.github/skills/tests/references/test-catalog.md	Drop references to `AndroidClientHandler` test/category

Files not reviewed (1)

src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs: Language not supported

Fix relative redirect handling by checking IsAbsoluteUri before comparing schemes, and escape the UseNativeHttpHandler property reference in the unsupported AndroidHttpClientHandlerType error message. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…-handler

jonathanpeppers · 2026-05-19T13:38:37Z

/review

github-actions · 2026-05-19T13:39:18Z

✅ Android PR Reviewer completed successfully!

github-actions

⚠️ Needs Changes

Clean PR that successfully removes the obsolete AndroidClientHandler class, simplifies GetHttpMessageHandler() to directly instantiate AndroidMessageHandler, and properly redirects users to $(UseNativeHttpHandler). The redirect behavior change for cross-scheme redirects is a nice alignment with SocketsHttpHandler. Public API tracking and API compatibility breakage files look correct.

However, the removal is incomplete — several references to the removed functionality were left behind:

Issues by severity

Severity	Count
❌ Error	1
⚠️ Warning	2
💡 Suggestion	3

Key issues

❌ Build break: EnvironmentFilesParserTests.DetectsHttpMessageHandler still references the removed HaveHttpMessageHandler property — this will fail to compile.
⚠️ Orphaned code: GenerateNativeApplicationConfigSources.HttpClientHandlerType property and EnvironmentBuilder.defaultHttpMessageHandler field are unused after this PR (the latter will trigger TreatWarningsAsErrors).
⚠️ Orphaned resource entries: XA1031, XA1031_HCH, XA1032, XA1033 were removed from Resources.Designer.cs but still exist in Resources.resx.

Positive callouts

The GetHttpMessageHandler() simplification is a great improvement — direct instantiation eliminates reflection, DynamicDependency, Type.GetType, and the XA_HTTP_CLIENT_HANDLER_TYPE env var indirection.
Good use of <Error> in targets to give users a clear migration path.
The redirect scheme change is well-isolated and the disposeRet = false pattern correctly delegates to the caller.

Generated by Android PR Reviewer for issue #11393 · ● 29.6M

simonrozsival · 2026-05-20T06:49:34Z

@copilot address review

Agent-Logs-Url: https://github.com/dotnet/android/sessions/0c11fefb-96ec-4116-b235-d8bd5c4adadd Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>

Copilot · 2026-05-20T07:16:50Z

@copilot address review

Addressed the outstanding review items in afecf6a: removed stale HaveHttpMessageHandler test usage, removed orphaned HttpClientHandlerType/defaultHttpMessageHandler, and removed obsolete XA1031/XA1032/XA1033 entries from Resources.resx.

simonrozsival · 2026-05-20T14:30:24Z

@copilot fix build:

       (CoreCompile target) -> 
         /Users/runner/work/1/s/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerTests.cs(19,44): error CS0246: The type or namespace name 'AndroidHandlerTestBase' could not be found (are you missing a using directive or an assembly reference?) [/Users/runner/work/1/s/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj]

    141 Warning(s)
    1 Error(s)
    ```

Agent-Logs-Url: https://github.com/dotnet/android/sessions/9ee1cba8-fd60-4ded-8d90-a256e0ca2402 Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>

Copilot · 2026-05-20T15:03:06Z

@copilot fix build:

       (CoreCompile target) ->

...

Fixed in 21c1cbd (with follow-up cleanup in f5e7f1f). I restored Xamarin.Android.Net/AndroidHandlerTestBase.cs and added it back to Mono.Android.NET-Tests.csproj, so AndroidMessageHandlerTests : AndroidHandlerTestBase now compiles again. No UI changes in this fix.

…-handler

Remove obsolete linker and test leftovers from the AndroidClientHandler removal. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Replace the removed HttpClientIntegrationTests fixture with AndroidMessageHandlerIntegrationTests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Document that AndroidHttpClientHandlerType is unsupported in .NET 11 and should be removed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Addressed all Android PR Reviewer comments in follow-up commits.

Agent-Logs-Url: https://github.com/dotnet/android/sessions/496ee485-21a1-4759-a312-5f7b41f6a75c Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

simonrozsival · 2026-05-20T21:25:03Z

/review

github-actions · 2026-05-20T21:25:32Z

✅ Android PR Reviewer completed successfully!

github-actions

Review Summary — ⚠️ Needs attention

Overall: Clean, thorough removal of the obsolete AndroidClientHandler class and its supporting infrastructure. The code deletion is consistent — all references to AndroidClientHandler, XA_HTTP_CLIENT_HANDLER_TYPE, HttpClientHandlerType, CheckClientHandlerType, and error codes XA1031–XA1033 are properly cleaned up. API compatibility breakages are documented, PublicAPI files are updated, and the migration error message in _CheckAndroidHttpClientHandlerType provides clear guidance.

Positive callouts

GetHttpMessageHandler simplification — The old reflection-based handler resolution with trimming annotations ([DynamicDependency], [UnconditionalSuppressMessage]) is replaced with a direct new AndroidMessageHandler(). Much safer and simpler.
Pre-existing bugs removed — The deleted ConfigureKeyManagerFactoryInternal and ConfigureCustomSSLSocketFactoryInternal methods were infinitely recursive (calling themselves instead of the non-Internal variants). Good riddance.
Test restructuring — Renaming AndroidClientHandlerTests.cs → AndroidHandlerTestBase.cs and consolidating HttpClientIntegrationTests.cs into AndroidMessageHandlerIntegrationTests.cs properly eliminates the dual-handler test hierarchy.

Issues by severity

Severity	Count	Summary
⚠️ Warning	1	Redirect scheme-change logic is a separate behavior change that blocks HTTP→HTTPS redirects
💡 Suggestion	2	Coded error for migration target, docs expansion

CI Status

Public CI checks (license/cla, dotnet-android) are ✅ passing.

Generated by Android PR Reviewer for issue #11393 · ● 17.9M

simonrozsival added 3 commits May 18, 2026 17:00

Align native handler behavior for redirects with the sockets handler

fdc9d89

Remove the obsolete AndroidClientHandler class and related code

bd17e91

Update reference build

695d481

Copilot AI review requested due to automatic review settings May 18, 2026 15:02

simonrozsival requested a review from jonathanpeppers as a code owner May 18, 2026 15:02

Copilot started reviewing on behalf of simonrozsival May 18, 2026 15:03 View session

Copilot AI reviewed May 18, 2026

View reviewed changes

Comment thread src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs Outdated

Comment thread src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets Outdated

simonrozsival and others added 2 commits May 19, 2026 11:46

Merge branch 'main' into dev/srozsival/remove-obsolete-android-client…

ff91508

…-handler

github-actions Bot previously requested changes May 19, 2026

View reviewed changes

Copilot started work on behalf of simonrozsival May 20, 2026 06:49 View session

Remove remaining AndroidHttpClientHandlerType leftovers

afecf6a

Agent-Logs-Url: https://github.com/dotnet/android/sessions/0c11fefb-96ec-4116-b235-d8bd5c4adadd Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>

Copilot finished work on behalf of simonrozsival May 20, 2026 07:17

Copilot started work on behalf of simonrozsival May 20, 2026 14:30 View session

Copilot AI and others added 2 commits May 20, 2026 14:58

Restore AndroidHandlerTestBase for AndroidMessageHandler tests

21c1cbd

Agent-Logs-Url: https://github.com/dotnet/android/sessions/9ee1cba8-fd60-4ded-8d90-a256e0ca2402 Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>

Fix typo in restored AndroidHandlerTestBase helper

f5e7f1f

Agent-Logs-Url: https://github.com/dotnet/android/sessions/9ee1cba8-fd60-4ded-8d90-a256e0ca2402 Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>

Copilot finished work on behalf of simonrozsival May 20, 2026 15:03

simonrozsival and others added 4 commits May 20, 2026 17:05

Merge branch 'main' into dev/srozsival/remove-obsolete-android-client…

88da023

…-handler

Address remaining review cleanup

0aef2c1

Remove obsolete linker and test leftovers from the AndroidClientHandler removal. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Update networking test catalog

30aa559

Replace the removed HttpClientIntegrationTests fixture with AndroidMessageHandlerIntegrationTests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Clarify AndroidHttpClientHandlerType docs

d893c52

Document that AndroidHttpClientHandlerType is unsupported in .NET 11 and should be removed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

jonathanpeppers reviewed May 20, 2026

View reviewed changes

Comment thread src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt

Copilot started work on behalf of jonathanpeppers May 20, 2026 17:47 View session

Copilot AI and others added 2 commits May 20, 2026 18:08

chore: investigate api-compat AppFunctionState CI failure

518fb04

Agent-Logs-Url: https://github.com/dotnet/android/sessions/496ee485-21a1-4759-a312-5f7b41f6a75c Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Restore api-compat baseline files and remove accidental lines file

5fc3025

Agent-Logs-Url: https://github.com/dotnet/android/sessions/496ee485-21a1-4759-a312-5f7b41f6a75c Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Copilot finished work on behalf of jonathanpeppers May 20, 2026 18:15

Copilot AI requested a review from jonathanpeppers May 20, 2026 18:15

github-actions Bot reviewed May 20, 2026

View reviewed changes

Comment thread src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs Outdated

Comment thread src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Comment thread Documentation/docs-mobile/building-apps/build-properties.md

jonathanpeppers approved these changes May 21, 2026

View reviewed changes

Fix bug

7451f40

simonrozsival enabled auto-merge (squash) May 21, 2026 15:16

simonrozsival disabled auto-merge May 22, 2026 04:08

simonrozsival merged commit ae2e49c into main May 22, 2026
3 checks passed

simonrozsival deleted the dev/srozsival/remove-obsolete-android-client-handler branch May 22, 2026 04:09

github-actions Bot locked and limited conversation to collaborators Jun 21, 2026

Uh oh!

Conversation

simonrozsival commented May 18, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

jonathanpeppers commented May 19, 2026

Uh oh!

github-actions Bot commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

⚠️ Needs Changes

Issues by severity

Key issues

Positive callouts

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

simonrozsival commented May 20, 2026

Uh oh!

Copilot AI commented May 20, 2026

Uh oh!

simonrozsival commented May 20, 2026

Uh oh!

Copilot AI commented May 20, 2026

Uh oh!

Uh oh!

simonrozsival commented May 20, 2026

Uh oh!

github-actions Bot commented May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Review Summary — ⚠️ Needs attention

Positive callouts

Issues by severity

CI Status

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions Bot commented May 19, 2026 •

edited

Loading

github-actions Bot commented May 20, 2026 •

edited

Loading