Skip to content

android: harden detached connect timeout gate#8696

Merged
myleshorton merged 1 commit intofisk/port-timeout-fix-to-mainfrom
atavism/port-timeout-fix
Apr 23, 2026
Merged

android: harden detached connect timeout gate#8696
myleshorton merged 1 commit intofisk/port-timeout-fix-to-mainfrom
atavism/port-timeout-fix

Conversation

@atavism
Copy link
Copy Markdown
Contributor

@atavism atavism commented Apr 23, 2026

Follow up on the port-timeout fix by making sure early coroutine cancellation cannot leave the Android VPN connect single-flight gate stuck on

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Hardens the Android VPN “detached connect” single-flight gate so it cannot remain stuck when a coroutine is cancelled before the async { ... } body begins executing, preventing subsequent connect attempts from being permanently rejected.

Changes:

  • Move connectInFlight reset logic from the async body’s finally to the Deferred completion callback.
  • Ensure early cancellation (before coroutine start) still triggers gate reset via invokeOnCompletion.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@myleshorton myleshorton merged commit 8998d94 into fisk/port-timeout-fix-to-main Apr 23, 2026
4 checks passed
@myleshorton myleshorton deleted the atavism/port-timeout-fix branch April 23, 2026 19:21
myleshorton added a commit that referenced this pull request Apr 23, 2026
Co-authored-by: atavism <atavism@users.noreply.github.com>
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.

3 participants