Encrypt form submissions and media with Android Keystore#3643

Draft

avazirna wants to merge 14 commits into

encrypt-form-submissions-with-keystore

Commits on Mar 28, 2026

Use Keystore key for new form records instead of per-form derived key

avazirna
and
claude
committed
Add Keystore decryption support in EncryptionIO and helper in FormRecord

avazirna
and
claude
committed
Branch SaveToDiskTask encryption on aesKey to support Keystore

avazirna
and
claude
committed
Skip passing AES key Intent extra for Keystore-encrypted forms

avazirna
and
claude
committed
Branch form record processing decryption for Keystore support

avazirna
and
claude
committed
Add Keystore-aware form submission path

avazirna
and
claude
committed
Add Keystore decryption support for form file export and dump

avazirna
and
claude
committed
Add unit tests for form Keystore encryption

avazirna
and
claude
committed

Commits on Mar 29, 2026

Refactor Keystore decryption method
avazirna
committed

Commits on Mar 31, 2026

Refactor form upload
avazirna
committed

Commits on Apr 1, 2026

Refactor - centralize decrypt cipher creation in EncryptionIO
avazirna
committed

Commits on Apr 2, 2026