From 4a0b2e68c8ecff9c8fa45f9999692cac0c5b6ecf Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 21 Jul 2019 22:52:28 +0300 Subject: [PATCH 1/2] Add DC_CMD_* constants --- src/constants.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/constants.rs b/src/constants.rs index ac956be43..de50237fc 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -491,3 +491,12 @@ pub enum KeyType { Public = 0, Private = 1, } + +pub const DC_CMD_GROUPNAME_CHANGED: libc::c_int = 2; +pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3; +pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4; +pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5; +pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6; +pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7; +pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8; +pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9; From 56f8717a40f2d8481d8bf9bb766aeeb78acbbac0 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 21 Jul 2019 22:22:11 +0300 Subject: [PATCH 2/2] Show AutocryptSetupMessage independently of show-emails settings Fixes #161 --- src/dc_receive_imf.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 913d76380..ae71b4827 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -215,7 +215,9 @@ pub unsafe fn dc_receive_imf( maybe this can be optimized later, by checking the state before the message body is downloaded */ let mut allow_creation: libc::c_int = 1; - if msgrmsg == 0 { + if mime_parser.is_system_message != DC_CMD_AUTOCRYPT_SETUP_MESSAGE + && msgrmsg == 0 + { let show_emails = context .sql .get_config_int(context, "show_emails")