Skip to content

Don't show the key storage out of sync toast when backup disabled#31506

Merged
richvdh merged 1 commit into
element-hq:developfrom
uhoreg:fix_key_storage_out_of_sync_backup_disabled
Dec 10, 2025
Merged

Don't show the key storage out of sync toast when backup disabled#31506
richvdh merged 1 commit into
element-hq:developfrom
uhoreg:fix_key_storage_out_of_sync_backup_disabled

Conversation

@uhoreg
Copy link
Copy Markdown
Member

@uhoreg uhoreg commented Dec 10, 2025

If key backup is purposely disabled/inactive, don't treat a missing backup key as the key storage being out of sync.

Fixes #31494

Checklist

@richvdh richvdh added the backport staging Label to automatically backport PR to staging branch label Dec 10, 2025
@richvdh richvdh added this pull request to the merge queue Dec 10, 2025
Merged via the queue into element-hq:develop with commit 4bd8eeb Dec 10, 2025
47 of 48 checks passed
RiotRobot pushed a commit that referenced this pull request Dec 10, 2025
github-merge-queue Bot pushed a commit that referenced this pull request Dec 10, 2025
…1506) (#31507)

(cherry picked from commit 4bd8eeb)

Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Comment thread src/DeviceListener.ts
Comment on lines +443 to +444
const backupKeyCached =
!keyBackupUploadActive || backupDisabled || (await crypto.getSessionBackupPrivateKey()) !== null;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this doesn't seem like a good name for this variable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport staging Label to automatically backport PR to staging branch T-Defect

Projects

None yet

Development

Successfully merging this pull request may close these issues.

"Your key storage is out of sync" toast shows when backup is disabled

3 participants