Repository navigation
chore: only set the demo network security config for retry test builds - #2824
Merged
Merged
Conversation
fadi-george
approved these changes
Oct 28, 2026
The demo app's main manifest pointed every build at a committed network_security_config.xml. Generate the config and a debug manifest only when -PRETRY_TEST_CA is passed, so normal builds carry no debug-overrides trust anchors. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 9bd9627) Co-authored-by: Cursor <cursoragent@cursor.com>
abdulraqeeb33
force-pushed
the
ar/demo-network-security-retry-only
branch
from
October 28, 2026 21:33
c610fd9 to
85bccf4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
One Line Summary
Extracts the demo app network security config change that was accidentally bundled into the 5.11.0 release PR.
Details
Motivation
#2820 was meant to be the 5.11.0 version bump only, but it also carried an unrelated demo app change. #2823 reverts that release so the Create Release PR workflow can be re-run cleanly. This PR carries the demo change forward on its own, so it is not lost in the revert.
The change itself: the demo app's main manifest pointed every build at a committed
network_security_config.xmlwhosedebug-overridestrusted user-installed CAs. That trust anchor is only needed whenscripts/retryproxies SDK traffic. Now the config and a debug manifest are generated only when-PRETRY_TEST_CAis passed, so normal demo builds carry no debug trust overrides.This is a cherry-pick of 9bd9627 from #2820, with the original author preserved. The commit type was changed from
fix:tochore:so a demo-only build tweak does not appear in the user-facing Bug Fixes section of the 5.11.0 release notes.Scope
Demo app build configuration only. No change to any published SDK artifact.
examples/demo/app/build.gradle.ktsgeneratesAndroidManifest.xmlalongside the existing generated res dir and wires both onto thedebugsource set, inside the existingdemoOverride("RETRY_TEST_CA")block.examples/demo/app/src/main/AndroidManifest.xmldrops the unconditionalandroid:networkSecurityConfigattribute.examples/demo/app/src/main/res/xml/network_security_config.xmlis deleted. TheRETRY_TEST_CAblock already writes its own copy intogenerated/retryTestCa/res/xml/, with both theuserand@raw/retry_test_caanchors.Without
-PRETRY_TEST_CA, neither the manifest attribute nor the resource exists, so there is no dangling@xml/network_security_configreference. With it, both appear together on the debug source set.Branching note
This PR is stacked on
revert-2820-rel/5.11.0so its diff shows only the demo commit. It should not merge before #2823.Testing
Unit testing
None. Demo app build configuration has no test coverage, and the change is not part of the published SDK.
Manual testing
Not re-tested on device. The commit is an unmodified cherry-pick of 9bd9627, which was already reviewed and CI-green on #2820.
Affected code checklist
Checklist
Overview
Testing
Final pass