Fix Chrome Custom Tab race condition causing window not to close after verification#16
Merged
Merged
Conversation
Auto close verification window
ALeoLeonard
approved these changes
Apr 27, 2026
gclaro-idme
approved these changes
Apr 27, 2026
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.
Problem
After verification completes, the Chrome Custom Tab was not dismissing
automatically on Android. Stephen Hagans at CVS reported this as an
ongoing issue after the previous fix.
Root Cause
IDmeRedirectActivity.handleIntent() was reading callingActivity after
calling handleRedirect(). handleRedirect() completes the deferred, which
allows the launchAuth coroutine to immediately resume on Dispatchers.IO
and null out callingActivity in its finally block — before the main
thread could read it. The window-close intent was silently dropped 100%
of the time under this ordering.
Fix
Capture IDmeAuthManager.callingActivity?.get() into a local variable
before handleRedirect() is called. The local variable is immune to
concurrent modification by the IO thread.
Files Changed