Remove ok_to_continue pattern from msg_prepare_raw()

This commit will fail CI due incorrect formatting. It is done
deliberately to simplify review process.
This commit is contained in:
Dmitry Bogatov
2019-09-07 03:06:13 +00:00
parent 400740fdba
commit c4c08f2552

View File

@@ -246,7 +246,6 @@ impl<'a> Chat<'a> {
) -> Result<u32, Error> { ) -> Result<u32, Error> {
let mut do_guarantee_e2ee: libc::c_int; let mut do_guarantee_e2ee: libc::c_int;
let e2ee_enabled: libc::c_int; let e2ee_enabled: libc::c_int;
let mut OK_TO_CONTINUE = true;
let mut new_references = "".into(); let mut new_references = "".into();
let mut new_in_reply_to = "".into(); let mut new_in_reply_to = "".into();
let mut msg_id = 0; let mut msg_id = 0;
@@ -295,7 +294,7 @@ impl<'a> Chat<'a> {
context, context,
0, "Cannot send message, contact for chat #{} not found.", self.id, 0, "Cannot send message, contact for chat #{} not found.", self.id,
); );
OK_TO_CONTINUE = false; return Ok(0);
} }
} else { } else {
if self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup { if self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup {
@@ -305,7 +304,7 @@ impl<'a> Chat<'a> {
} }
} }
} }
if OK_TO_CONTINUE { {
/* check if we can guarantee E2EE for this message. /* check if we can guarantee E2EE for this message.
if we guarantee E2EE, and circumstances change if we guarantee E2EE, and circumstances change
so that E2EE is no longer available at a later point (reset, changed settings), so that E2EE is no longer available at a later point (reset, changed settings),