diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 5d0f08366..6dec8e23a 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -2085,7 +2085,7 @@ pub unsafe extern "C" fn dc_msg_get_showpadlock(msg: *mut dc_msg_t) -> libc::c_i return 0; } let ffi_msg = &*msg; - message::dc_msg_get_showpadlock(&ffi_msg.message) + message::dc_msg_get_showpadlock(&ffi_msg.message) as libc::c_int } #[no_mangle] diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs index 3df2ab041..b88791e9b 100644 --- a/examples/repl/cmdline.rs +++ b/examples/repl/cmdline.rs @@ -229,7 +229,7 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef, msg: &Message) { "{}#{}{}{}: {} (Contact#{}): {} {}{}{}{} [{}]", prefix.as_ref(), dc_msg_get_id(msg) as libc::c_int, - if 0 != dc_msg_get_showpadlock(msg) { + if dc_msg_get_showpadlock(msg) { "🔒" } else { "" diff --git a/src/message.rs b/src/message.rs index 553922fd2..7b50fb9b5 100644 --- a/src/message.rs +++ b/src/message.rs @@ -699,13 +699,8 @@ pub fn dc_msg_get_duration(msg: &Message) -> libc::c_int { msg.param.get_int(Param::Duration).unwrap_or_default() } -// TODO should return bool /rtn -pub fn dc_msg_get_showpadlock(msg: &Message) -> libc::c_int { - if msg.param.get_int(Param::GuranteeE2ee).unwrap_or_default() != 0 { - return 1; - } - - 0 +pub fn dc_msg_get_showpadlock(msg: &Message) -> bool { + msg.param.get_int(Param::GuranteeE2ee).unwrap_or_default() != 0 } pub fn dc_msg_get_summary(context: &Context, msg: &mut Message, chat: Option<&Chat>) -> Lot {