Log out the temporary 3party device when the upgrade fails - #9817
Merged
CDRussell merged 1 commit intoSep 24, 2026
Merged
Conversation
CDRussell
marked this pull request as ready for review
September 21, 2026 12:31
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review for a one-time review, or @claude review always to subscribe this PR to a review on every future push.
Tip: disable this comment in your organization's Code Review settings.
CDRussell
deleted the
feature/craig/best_effort_logout_3party_already_upgraded
branch
September 24, 2026 20:49
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.
Task/Issue URL: https://app.asana.com/1/137249556945/project/608920331025315/task/1218692308523756?focus=true
Tech Design URL (if applicable):
API Proposals URL(s) (if applicable):
Description
Pairing Android with a 3party code fails correctly when that account already has a native DDG device, but it can leave Android showing as a synced device incorrectly. That's one example of a failure path and there are a few others
like it.
This PR makes it so that when we hit an error, we do a best-effort logout of the device Android registered during the 3party login, which is what the Windows and Apple clients do already.
Steps to test this PR
Need two devices/emulators to test fully.
internalvariantddgcredential)Create 3party Credentialbutton, thenCopy 3party Recovery CodebuttonSync With Another Device, and paste the 3party recovery codeStack created with GitHub Stacks CLI • Give Feedback 💬