Skip to content

Log out the temporary 3party device when the upgrade fails - #9817

Merged
CDRussell merged 1 commit into
developfrom
feature/craig/best_effort_logout_3party_already_upgraded
Sep 24, 2026
Merged

CDRussell merged 1 commit into
developfrom
feature/craig/best_effort_logout_3party_already_upgraded

Conversation

@CDRussell

@CDRussell CDRussell commented Sep 21, 2026 •

Copy link
Copy Markdown
Member

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.

  • Fresh install from this branch on two Androids internal variant
  • Set up sync on Device A (meaning this account will have a ddg credential)
  • On Device A still, go to sync dev settings
  • Tap Create 3party Credential button, then Copy 3party Recovery Code button
  • On Device B, set up sync Sync With Another Device, and paste the 3party recovery code
  • Verify Device B shows "already upgraded" error
  • On Device A, allow the device list to refresh and verify that Device B is not there

Stack created with GitHub Stacks CLI • Give Feedback 💬

@CDRussell
CDRussell marked this pull request as ready for review September 21, 2026 12:31

@claude claude Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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 CDRussell assigned cmonfortep and unassigned MiSikora Sep 21, 2026

@cmonfortep cmonfortep left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@CDRussell
CDRussell added this pull request to the merge queue Sep 24, 2026
Merged via the queue into develop with commit 9767f07 Sep 24, 2026
48 of 51 checks passed
@CDRussell
CDRussell deleted the feature/craig/best_effort_logout_3party_already_upgraded branch September 24, 2026 20:49
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