Skip to content

Commit cfaa8ce

Browse files
authored
handle classic emails as such only in classic profiles (#6767)
next android/desktop/ios releases won't have the "Show Classic Emails" option for chatmail. to avoid issues with user that have set sth else than "All", we ignore the option alltogether for chatmail profiles. ftr, i do not expect ppl having that option changed for chatmail much, it does not make much sense. so this PR is mainly to save our limited support resources :) (usecase: "look, i am using chatmail to sign up at SERVICE, but for security reasons i set show=all only when i reset my password" :) one could also do that in a migration, however, (a) migrations always come with some risk, even the easiest ones, and (b) the show_emails option is subject to change or disappear anyways, subsequent changes are easier in code than in additional or removed migrations, and (c) it is really only one line, that does not add much with complexity
1 parent 89a73d7 commit cfaa8ce

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/receive_imf.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,10 @@ async fn add_parts(
767767
let allow_creation;
768768
if mime_parser.is_system_message != SystemMessage::AutocryptSetupMessage
769769
&& is_dc_message == MessengerMessage::No
770+
&& !context.get_config_bool(Config::IsChatmail).await?
770771
{
771-
// this message is a classic email not a chat-message nor a reply to one
772+
// the message is a classic email in a classic profile
773+
// (in chatmail profiles, we always show all messages, because shared dc-mua usage is not supported)
772774
match show_emails {
773775
ShowEmails::Off => {
774776
info!(context, "Classical email not shown (TRASH).");

0 commit comments

Comments
 (0)