Handle sync recovery basic scenario - #9356
Merged
Merged
Conversation
This was referenced Jul 31, 2026
Contributor
Author
35 tasks
This was referenced Jul 31, 2026
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-recovery
branch
from
August 3, 2026 12:44
1131a63 to
eeb940d
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-another-device-logic
branch
from
August 3, 2026 12:44
94137bc to
4dccacb
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-recovery
branch
from
August 3, 2026 13:13
eeb940d to
94152d2
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-another-device-logic
branch
from
August 3, 2026 13:13
4dccacb to
75ff030
Compare
CDRussell
approved these changes
Aug 3, 2026
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-recovery
branch
from
August 3, 2026 16:30
94152d2 to
cbe610b
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-another-device-logic
branch
from
August 3, 2026 16:30
75ff030 to
015cca9
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-recovery
branch
from
August 4, 2026 07:11
cbe610b to
40915f5
Compare
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-another-device-logic
branch
from
August 4, 2026 07:11
015cca9 to
4344ead
Compare
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 40915f5. Configure here.
Contributor
Author
Merge activity
|
MiSikora
changed the base branch from
feature/mehow/simple-sync/sync-another-device-logic
to
graphite-base/9356
August 4, 2026 13:09
MiSikora
force-pushed
the
feature/mehow/simple-sync/sync-recovery
branch
from
August 4, 2026 13:40
40915f5 to
9b276ef
Compare
This was referenced Aug 5, 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.


Task/Issue URL: https://app.asana.com/1/137249556945/project/1216103556496795/task/1217050743419836?focus=true
Tech Design URL (if applicable): https://app.asana.com/1/137249556945/project/1216103556496795/task/1216509582049467?focus=true
API Proposals URL(s) (if applicable): N/A
Description
Wires up the "Recover Synced Data" flow in the simplified Sync Settings screen, so users can restore their synced data with a recovery code, and adds a confirmation screen shown when recovery completes.
Recovery flow:
Cleanup:
AskRemoveDevice,AskSetupSyncDeepLink,AskTurnOffSync,ShowRecoveryCode) are now explicit no-ops instead of TODO logs.ShowDeviceConnectedcommand is removed from the existing Sync Settings screen.Steps to test this PR
Note
Prepare yourself a recovery PDF before executing these tests.
Recover synced data with a recovery code
Scan a pairing code from the recovery flow
Scan a recovery code from the pairing flow
UI changes
Note
Medium Risk
Touches account recovery and pairing completion paths across multiple activities; incorrect
OriginalFlowhandling could skip or wrongly show the recovery-code step after login.Overview
Adds the Recover Synced Data path to simplified Sync Settings v2: a new intro screen, scanner behavior in recovery mode, and completion routing driven by
OriginalFlowinstead of pairing role/method.Recover flow:
IntroRecoverSyncDatain v2SyncActivitynow opensRecoverSyncedDataActivity(after auth), which launchesReadSyncCodeContractwithOriginalFlow.RECOVER_SYNCED_DATA. In recovery mode, Show QR Code is hidden on the scanner; the exchange screen headline switches to Recovering data; v2 recovery login triggers the acknowledgement animation before finishing.Result model:
SyncPairingResult.Successnow carriesoriginalFlow(SYNC_THIS_DEVICE,SYNC_WITH_ANOTHER,RECOVER_SYNCED_DATA) instead ofRoleandPairingMethod. That value is passed throughDisplayQrCode/ExchangeSyncCode/ReadSyncCodecontracts and intents sohandlePairingResultcan show the recovery-code screen for sync-this-device and recover flows, but not when adding another device.Cleanup: Removes
ShowDeviceConnected/ legacySETUP_COMPLETEhandling from v1SyncActivity. Several v2 commands that have no simplified UI are explicit no-ops instead of TODO logs.Reviewed by Cursor Bugbot for commit 9b276ef. Bugbot is set up for automated code reviews on this repo. Configure here.