1575636 - When replying to a saved message with embedded image, a blocked image notification comes up

Status: RESOLVED FIXED

(Thunderbird :: Message Compose Window, defect)

Description

[Jorg K (CEST = GMT+2)]

When replying to a saved message with embedded image, a blocked image notification comes up.

Test message for example
https://searchfox.org/comm-central/source/mailnews/test/data/05-HTML+embedded-image.eml

When forwarding the same message, no blocked image notification comes up.

Found while looking at bug 1575330.

Comment 1

[Jorg K (CEST = GMT+2)]

Add

      dump(`=== ${src}\n`);
      dump(`=== ${originalMsgNeckoURI.value.spec}\n`);

before
https://searchfox.org/comm-central/rev/3d360e890307be83b936f8604a80744bde81387e/mail/components/compose/content/MsgComposeCommands.js#6724

And you'll see this:

Forward:
=== mailbox:///C:/mozilla-source/comm-central/comm/mailnews/test/data/05-HTML+embedded-image.eml?fetchCompleteMessage=true&number=0&part=1.2&filename=kigaaldcbanejcbi.png
=== mailbox:///C:/mozilla-source/comm-central/comm/mailnews/test/data/05-HTML+embedded-image.eml?type=application/x-message-display&fetchCompleteMessage=true&number=0
The code strips type=application/x-message-display so src starts with the Necko spec.

Reply:
=== mailbox:///C:/mozilla-source/comm-central/comm/mailnews/test/data/05-HTML+embedded-image.eml?number=0&header=quotebody&part=1.2&filename=kigaaldcbanejcbi.png
=== file:///C:/mozilla-source/comm-central/comm/mailnews/test/data/05-HTML+embedded-image.eml?type=application/x-message-display

So they don't match. Uff. I though this would be easy to fix, but no.

Comment 2

[Jorg K (CEST = GMT+2)]

Attachment: 1575636-reply-from-file.patch

Total hack, but works ;-) - We forgot this case when fixing bug 1412639.

Comment 3

[:aceman]

Comment on attachment 9087187 [details] [diff] [review]
1575636-reply-from-file.patch

Review of attachment 9087187 [details] [diff] [review]:
-----------------------------------------------------------------

OK, this supresses the notification. If the number=0 is always present and constant for a saved message then this could work.
Thanks.

::: mail/components/compose/content/MsgComposeCommands.js
@@ +6722,5 @@
>        let originalMsgNeckoURI = {};
>        msgSvc.GetUrlForUri(gOriginalMsgURI, originalMsgNeckoURI, null);
>        if (src.startsWith(removeQueryPart(originalMsgNeckoURI.value.spec,
> +                                         "type=application/x-message-display"))
> +          ||

A bit strange placement. What will all the beautifiers do with this? :)

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/a255e8f77470
Handle saved message with embedded images better on reply. r=aceman

Comment 5

[Jorg K (CEST = GMT+2)]

TB 69 beta 4:
https://hg.mozilla.org/releases/comm-beta/rev/07ec429a494851508d76355c3337e03a28c07adc

Comment 6

[Jorg K (CEST = GMT+2)]

TB 68.1 ESR:
https://hg.mozilla.org/releases/comm-esr68/rev/b2b2bbb98ea41f452ecf3df3281c7c56f9f01b1d