fix: reset encryption key on wipe #674
Merged
Conversation
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
ovitrif
force-pushed
the
fix/wipe-keystore-reset
branch
from
a087fd8 to
d62217e
Compare
ovitrif
force-pushed
the
fix/wipe-keystore-reset
branch
from
d62217e to
b735c6d
Compare
ovitrif
changed the title
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. |
jvsena42
approved these changes
Jan 21, 2026
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.
This PR fixes keystore cleanup during wallet wipe to prevent stale encryption keys from causing issues on subsequent wallet creation.
Description
When wiping a wallet, the keychain entries were cleared but the Android KeyStore encryption key remained. This could cause encryption/decryption failures if a new wallet reuses the same alias with different key material. The fix adds a
deleteEncryptionKey()method toAndroidKeyStoreand calls it during the wipe process.Preview
Android.Studio.2026-01-21.002772.mp4
Note
Nothing changed visually, just showing that the flow still works as expected.
QA Notes
Tests:
1. Wallet wipe and restore