Skip to content

chore: only set the demo network security config for retry test builds - #2824

Merged
abdulraqeeb33 merged 1 commit into
mainfrom
ar/demo-network-security-retry-only
Oct 28, 2026
Merged

abdulraqeeb33 merged 1 commit into
mainfrom
ar/demo-network-security-retry-only

Conversation

@abdulraqeeb33

Copy link
Copy Markdown
Contributor

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.xml whose debug-overrides trusted user-installed CAs. That trust anchor is only needed when scripts/retry proxies SDK traffic. Now the config and a debug manifest are generated only when -PRETRY_TEST_CA is 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: to chore: 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.kts generates AndroidManifest.xml alongside the existing generated res dir and wires both onto the debug source set, inside the existing demoOverride("RETRY_TEST_CA") block.
  • examples/demo/app/src/main/AndroidManifest.xml drops the unconditional android:networkSecurityConfig attribute.
  • examples/demo/app/src/main/res/xml/network_security_config.xml is deleted. The RETRY_TEST_CA block already writes its own copy into generated/retryTestCa/res/xml/, with both the user and @raw/retry_test_ca anchors.

Without -PRETRY_TEST_CA, neither the manifest attribute nor the resource exists, so there is no dangling @xml/network_security_config reference. With it, both appear together on the debug source set.

Branching note

This PR is stacked on revert-2820-rel/5.11.0 so 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

  • Notifications
    • Display
    • Open
    • Push Processing
    • Confirm Deliveries
  • Outcomes
  • Sessions
  • In-App Messaging
  • REST API requests
  • Public API changes

Checklist

Overview

  • I have filled out all REQUIRED sections above
  • PR does one thing
  • Any Public API changes are explained in the PR details and conform to existing APIs

Testing

  • I have included test coverage for these changes, or explained why they are not needed
  • All automated tests pass, or I explained why that is not possible
  • I have personally tested this on my device, or explained why that is not possible

Final pass

  • Code is as readable as possible.
  • I have reviewed this PR myself, ensuring it meets each checklist item

@abdulraqeeb33
abdulraqeeb33 requested a review from a team October 28, 2026 21:29
@abdulraqeeb33
abdulraqeeb33 added this pull request to stack #2825 October 28, 2026 21:29
Base automatically changed from revert-2820-rel/5.11.0 to main October 28, 2026 21:33
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
abdulraqeeb33 force-pushed the ar/demo-network-security-retry-only branch from c610fd9 to 85bccf4 Compare October 28, 2026 21:33
@abdulraqeeb33
abdulraqeeb33 merged commit 4325a3d into main Oct 28, 2026
3 of 4 checks passed
@abdulraqeeb33
abdulraqeeb33 deleted the ar/demo-network-security-retry-only branch October 28, 2026 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants