Skip to content

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Sep 9, 2025

Depends on matrix-org/matrix-rust-sdk#5647

Content

Currently, if you verify using a recovery key, but the backup key is corrupt, it will fail, saying that you entered the incorrect recovery key, even if you entered the correct recovery key. This PR ignores errors coming from importing secrets from secret storage, allowing those errors to be handle by the "key storage out of sync" detection.

Motivation and context

Fixes #5099

Tests

Tested devices

  • Physical
  • Emulator
  • OS version(s): Android 16 (emulated Pixel 9)

Checklist

  • Changes have been tested on an Android device or Android emulator with API 24
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • You've made a self review of your PR

Copy link
Contributor

github-actions bot commented Sep 9, 2025

Thank you for your contribution! Here are a few things to check in the PR to ensure it's reviewed as quickly as possible:

  • Your branch should be based on origin/develop, at least when it was created.
  • The title of the PR will be used for release notes, so it needs to describe the change visible to the user.
  • The test pass locally running ./gradlew test.
  • The code quality check suite pass locally running ./gradlew runQualityChecks.
  • If you modified anything related to the UI, including previews, you'll have to run the Record screenshots GH action in your forked repo: that will generate compatible new screenshots. However, given Github Actions limitations, it will prevent the CI from running temporarily, until you upload a new commit after that one. To do so, just pull the latest changes and push an empty commit.

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.

Attempting to verify with recovery key reports "incorrect recovery key" if 4S lacks backup key
1 participant