refactor(mimefactory): add Encryption enum - #8573
Open
link2xt wants to merge 2 commits into
Open
Conversation
link2xt
force-pushed
the
link2xt/encryption-enum
branch
2 times, most recently
from
August 12, 2026 19:51
f0f1d06 to
d0a6268
Compare
link2xt
marked this pull request as ready for review
August 12, 2026 19:57
hpk42
approved these changes
Aug 12, 2026
hpk42
left a comment
hpk42
left a comment
Contributor
There was a problem hiding this comment.
A good refactoring although it's a bit hard to know if it fully preserves behaviour especially around symmetric encryption -- it seems that should_encrypt_with_broadcast_secret is not actually used anymore.
| // created before we had symmetric encryption, | ||
| // we show an error message. | ||
| let text = BROADCAST_INCOMPATIBILITY_MSG; | ||
| chat::add_info_msg(context, chat.id, text).await?; |
Contributor
There was a problem hiding this comment.
this adds a message to the DB which is a bit unexpected for the from_msg loader function returning a MimeFactory.
Collaborator
Author
There was a problem hiding this comment.
Maybe the message can be removed completely, it was for the old broadcast lists. Users should have migrated to channels by now.
Comment on lines
+1641
to
+1664
| is_encrypted: bool, | ||
| will_be_encrypted: bool, |
Contributor
There was a problem hiding this comment.
this creates a lot of unrelated churn in the diff, and i am not sure it's an improvement.
Comment on lines
+77
to
+79
| /// Vector of pairs of recipient | ||
| /// addresses and OpenPGP keys | ||
| /// to use for encryption. |
Contributor
There was a problem hiding this comment.
this partially repeats the types and has too short lines.
Suggested change
| /// Vector of pairs of recipient | |
| /// addresses and OpenPGP keys | |
| /// to use for encryption. | |
| /// Addresses and OpenPGP keys to use for encryption. |
link2xt
force-pushed
the
link2xt/encryption-enum
branch
2 times, most recently
from
August 13, 2026 16:40
e484810 to
01f3d9b
Compare
Creating QR code or sending a message will still fail with a shorter error, but no info message will be created anymore. Most users should have migrated the channels by recreating them by now. This change is needed for moving loading of the shared secret to earlier stages of message preparation, otherwise mimefactory will have to create these info messages when loading the message into memory.
This replaces independent data structures which allowed invalid state of having both the public keys and the shared secret, or having a shared secret but not encrypting the message because encryption_pubkeys was None instead of Some(Vec::new()).
link2xt
force-pushed
the
link2xt/encryption-enum
branch
from
August 13, 2026 16:57
01f3d9b to
5799581
Compare
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
2 participants
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 replaces independent data structures
which allowed invalid state of having both the public keys and the shared secret, or having a shared secret
but not encrypting the message because encryption_pubkeys was None instead of Some(Vec::new()).