fix: Sort most system messages to the bottom of the chat #7444
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
This was referenced Nov 14, 2025
Hocuri
changed the title
r10s
approved these changes
Nov 14, 2025
| -------------------------------------------------------------------------------- | ||
| Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] | ||
| Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] | ||
| Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] |
Contributor
There was a problem hiding this comment.
we should also change the default fallback text to "Establishing connection, please wait…" and change the example string in deltachat.h etc.
iequidoo
approved these changes
Nov 14, 2025
| context: &Context, | ||
| timestamp_sort: i64, | ||
| ) -> Result<()> { | ||
| pub(crate) async fn add_encrypted_msg(self, context: &Context, timestamp: i64) -> Result<()> { |
Collaborator
There was a problem hiding this comment.
Btw, the naming for this is weird. One may think that it adds an arbitrary encrypted message to the chat. Should be add_e2ee_notice() or so
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.
Fix #7435
For most messages,
calc_sort_timestamp()makes sure that they are at the correct place; esp. that they are not above system messages or other noticed/seen messages.Most callers of
add_info_msg(), however, didn't callcalc_sort_timestamp(), and just usedtime()orsmeared_time()to get the sort timestamp. Because of this, system messages could sometimes wrongly be sorted above other messages.This PR fixes this by making the sort timestamp optional in
add_info_msg*(). If the sort timestamp isn't passed, then the message is sorted to the bottom of the chat.sent_rcvd_timestampis not optional anymore, because we need some timestamp that can be shown to the user (most callers just passtime()there).