From 047d09bcb1d6d87eb1dba9788217917d150527be Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sat, 11 Jan 2020 22:38:05 +0300 Subject: [PATCH] Do not pass &Sql to parent_is_encrypted() --- src/chat.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chat.rs b/src/chat.rs index de4b20b69..4ad64c3f3 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -19,7 +19,7 @@ use crate::job::*; use crate::message::{self, InvalidMsgId, Message, MessageState, MsgId}; use crate::mimeparser::SystemMessage; use crate::param::*; -use crate::sql::{self, Sql}; +use crate::sql; use crate::stock::StockMessage; /// An object representing a single chat in memory. @@ -202,7 +202,8 @@ impl Chat { .ok() } - fn parent_is_encrypted(&self, context: &Context, sql: &Sql) -> bool { + fn parent_is_encrypted(&self, context: &Context) -> bool { + let sql = &context.sql; let packed: Option = sql.query_get_value( context, "SELECT param \ @@ -425,7 +426,7 @@ impl Chat { } } - if can_encrypt && (all_mutual || self.parent_is_encrypted(context, &context.sql)) { + if can_encrypt && (all_mutual || self.parent_is_encrypted(context)) { msg.param.set_int(Param::GuaranteeE2ee, 1); } }