feat: send pre-message on messages with large attachments #7410

Simon-Laux · 2025-11-06T16:51:42Z

part of #7367

progress / what's to do:

send pre-message
The message's state must be set to MessageState::OutDelivered only after both messages are sent. If a read receipt is received, the message can be OutMdnRcvd or OutPending; let's just do whatever is easiest for now. Take care not to revert from OutMdnReceived to OutDelivered if we first receive a read receipt and then deliver the full message.
- this is already the case:
  - OutDelivered is set when a message is sent out and has no remaining send jobs in the smtp table for this message id - so already works since full message and pre message have same msgId in that table.
  - OutMdnRcvd is a "virtual" state ([Tracking Issue] Pre-Messages #7367 (comment)), so going back to OutDelivered can't happen anymore
delimit ChatFullMessageId with < and > like the other message ids
add tests
- test that pre message is sent for attachment larger than X
  - test that correct headers are present on both messages
  - also test that Autocrypt-gossip and selfavatar should never go into full-messages
- test that no pre message is sent for attachment smaller than X
  - no "is full message" header should be present
- test that pre message is not send for large webxdc update or large text
fix test receive_imf::receive_imf_tests::test_dont_reverify_by_self_on_outgoing_msg

src/chat.rs

and modify it to employ message reordering instead of a partially downloaded instance

full-messages and fix exclusion of gossip header, which was broken

`receive_imf::receive_imf_tests::test_dont_reverify_by_self_on_outgoing_msg`

and full message doesn't have these headers

src/mimefactory.rs

src/download.rs

src/mimefactory.rs

easier solution for `should_do_gossip` with less changes. thanks to iequidoo for suggesting it apply test naming suggestion remove autoxrypt and self avatar check in `test_sending_pre_message` because it is already in `test_pre_message_contains_selfavatar_and_gossip_and_full_message_does_not` set self.attach_selfavatar to false in render method if pre message mode is full message merge `test_not_sending_pre_message_for_large_text` into `test_not_sending_pre_message_no_attachment`

Hocuri

I finally got around to review, sorry it took so long!

LGTM once comments are addressed.

src/download.rs

Hocuri · 2025-11-21T20:12:24Z

src/download.rs

+            .await;
+
+        let mut msg = Message::new(Viewtype::File);
+        msg.set_file_from_bytes(&alice.ctx, "test.bin", &[0u8; 300_000], None)?;


Just a heads-up: AFAIK, &[0u8; 300_000] actually includes 300kb of bytes into the test binary, which slows down compile times a bit. I'm not sure right now what could be a good fix for this; maybe it's fine. Maybe vec![300_000] would be better. But we can just ignore the problem for now; if we want to improve compile times, then doing something about the many include_str!()s in tests has likely the higher impact.

src/download.rs

src/headerdef.rs

src/chat.rs

src/download.rs

src/headerdef.rs

Co-authored-by: Hocuri <hocuri@gmx.de>

src/mimefactory.rs

iequidoo · 2025-11-24T06:08:18Z

src/mimefactory.rs

        Ok(message)
    }
+
+    pub fn will_be_encrypted(&self) -> bool {


Maybe rename to should_encrypt()? It sounds more consistent with other should_* functions like should_skip_autocrypt()

I think "should" sounds to vague in this case. it is used to set a variable with the name is_encrypted.

Co-authored-by: iequidoo <117991069+iequidoo@users.noreply.github.com>

Simon-Laux self-assigned this Nov 6, 2025

Simon-Laux commented Nov 6, 2025

View reviewed changes

src/chat.rs Outdated Show resolved Hide resolved

Simon-Laux mentioned this pull request Nov 6, 2025

[Tracking Issue] Pre-Messages #7367

Open

7 tasks

Simon-Laux force-pushed the simon/sending-pre-message branch 2 times, most recently from a283803 to fcdd28c Compare November 8, 2025 18:38

Simon-Laux mentioned this pull request Nov 8, 2025

[Branch] pre-messages / next version of download on demand #7371

Draft

Simon-Laux marked this pull request as ready for review November 8, 2025 20:23

Hocuri mentioned this pull request Nov 11, 2025

remove: partial downloads (remove creation of the stub messages) #7373

Merged

2 tasks

Simon-Laux force-pushed the simon/remove-partial-download-of-messages branch from e564a9b to 05a1967 Compare November 12, 2025 19:38

Simon-Laux requested review from Hocuri, iequidoo and link2xt November 14, 2025 21:25

Simon-Laux force-pushed the simon/sending-pre-message branch from 90b61a1 to 1f0cc45 Compare November 14, 2025 21:35

Base automatically changed from simon/remove-partial-download-of-messages to pre-messages November 14, 2025 22:52

Simon-Laux force-pushed the simon/sending-pre-message branch from e97a448 to 2b900c3 Compare November 14, 2025 22:59

Simon-Laux and others added 14 commits November 16, 2025 21:07

fix python lint errors

ba573bb

fix lint of python test

b69082d

restore test test_webxdc_update_for_not_downloaded_instance and rename

17df902

and modify it to employ message reordering instead of a partially downloaded instance

remove test_webxdc_update_for_not_yet_received_instance

6f9823f

feat: send pre-message on messages with large attachments

6042fd0

allow unused for MAX_FETCH_MSG_SIZE

1954506

remove todo comment

f49ecfa

add tests for sending pre-messages

bf5d081

delimit Chat-Full-Message-ID with <> like other message ids.

709a965

fix test

9ffe300

test that Autocrypt-gossip and selfavatar should never go into

a3846ee

full-messages and fix exclusion of gossip header, which was broken

fix bug that broke

74a1fc9

`receive_imf::receive_imf_tests::test_dont_reverify_by_self_on_outgoing_msg`

cargo fmt after rebase

2d32a58

fix typo

305498d

Simon-Laux force-pushed the simon/sending-pre-message branch from 2b900c3 to 305498d Compare November 16, 2025 20:07

Simon-Laux added 6 commits November 21, 2025 02:26

remove accidental semicolon

1c9df9d

format sql statement

d9cf44e

async closure to extra method for readability

dcfab1b

add Tests that pre message has autocrypt gossip headers and self avatar

6a34464

and full message doesn't have these headers

don't send pre message for unencrypted messages and add test for it

9f42ade

fix encryption check

f45faae

Simon-Laux requested review from Hocuri and iequidoo November 21, 2025 03:28

iequidoo reviewed Nov 22, 2025

View reviewed changes

src/mimefactory.rs Outdated Show resolved Hide resolved

src/download.rs Outdated Show resolved Hide resolved

src/download.rs Outdated Show resolved Hide resolved

src/mimefactory.rs Outdated Show resolved Hide resolved

Simon-Laux requested a review from iequidoo November 23, 2025 02:28

Hocuri reviewed Nov 23, 2025

View reviewed changes

Simon-Laux added 3 commits November 24, 2025 03:01

reference to test contexts

027f3d9

assert!(! to assert_eq!(,false for "easier" code reading

3a36854

test: simplify chat creation by using .create_chat_with_contact

5ec079c

Simon-Laux commented Nov 24, 2025

View reviewed changes

src/headerdef.rs Outdated Show resolved Hide resolved

Simon-Laux and others added 5 commits November 24, 2025 02:22

Apply suggestions from code review

d5f8819

Co-authored-by: Hocuri <hocuri@gmx.de>

remove now unessesary test

3cc7a56

sql style

2ef8b6f

rm unused imports

413a6ca

tests: .headers instead of .get_headers()

9d3a506

iequidoo reviewed Nov 24, 2025

View reviewed changes

src/mimefactory.rs Outdated Show resolved Hide resolved

src/mimefactory.rs Show resolved Hide resolved

iequidoo reviewed Nov 24, 2025

View reviewed changes

iequidoo approved these changes Nov 24, 2025

View reviewed changes

Hocuri approved these changes Nov 24, 2025

View reviewed changes

Simon-Laux and others added 3 commits November 26, 2025 14:51

get_smtp_rows_for_msg now returns SentMessage instead of tuple

1dcd328

use bob.parse_msg(msg) instead of using mimeparser directly

8737c29

Update src/mimefactory.rs

381b709

Co-authored-by: iequidoo <117991069+iequidoo@users.noreply.github.com>

Simon-Laux merged commit 1ec5606 into pre-messages Nov 26, 2025
17 of 19 checks passed

Simon-Laux deleted the simon/sending-pre-message branch November 26, 2025 14:14

Uh oh!

feat: send pre-message on messages with large attachments #7410

feat: send pre-message on messages with large attachments #7410

Conversation

Simon-Laux commented Nov 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hocuri left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hocuri Nov 21, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iequidoo Nov 24, 2025

Choose a reason for hiding this comment

Uh oh!

Simon-Laux Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Simon-Laux commented Nov 6, 2025 •

edited

Loading

Hocuri left a comment •

edited

Loading