yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 10:39:27 +02:00
Code Issues Releases Wiki Activity

Merge pull request #604 from deltachat/hotfix-asm

Browse source 
show up autocrypt setup messages even if emails are not displayed
This commit is contained in:
björn petersen 2019-03-10 00:16:02 +01:00 • committed by GitHub
commit dddae8becc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/dc_mimeparser.c
View file

@ -1533,7 +1533,6 @@ void dc_mimeparser_parse(dc_mimeparser_t* mimeparser, const char* body_not_termi
}
}
}
mimeparser->is_send_by_messenger = 0; /* do not treat a setup message as a messenger message (eg. do not move setup messages to the Chats-folder; there may be a 3rd device that wants to handle it) */
}
/* some special system message? */

6
src/dc_move.c
View file

@ -19,6 +19,12 @@ void dc_do_heuristics_moves(dc_context_t* context, const char* folder, uint32_t
msg = dc_msg_new_load(context, msg_id);
if (dc_msg_is_setupmessage(msg)) {
// do not move setup messages;
// there may be a non-delta device that wants to handle it
goto cleanup;
}
if (dc_is_mvbox(context, folder)) {
dc_update_msg_move_state(context, msg->rfc724_mid, DC_MOVE_STATE_STAY);
goto cleanup;