Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not pass &Sql to parent_is_encrypted()

Browse Source
This commit is contained in:
Alexander Krotov
2020-01-11 22:38:05 +03:00
committed by holger krekel
parent e1ca6b5181
commit 047d09bcb1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.rs
View File

@@ -19,7 +19,7 @@ use crate::job::*;
use crate::message::{self, InvalidMsgId, Message, MessageState, MsgId}; use crate::message::{self, InvalidMsgId, Message, MessageState, MsgId};
use crate::mimeparser::SystemMessage; use crate::mimeparser::SystemMessage;
use crate::param::*; use crate::param::*;
use crate::sql::{self, Sql}; use crate::sql;
use crate::stock::StockMessage; use crate::stock::StockMessage;
/// An object representing a single chat in memory. /// An object representing a single chat in memory.
@@ -202,7 +202,8 @@ impl Chat {
.ok() .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<String> = sql.query_get_value( let packed: Option<String> = sql.query_get_value(
context, context,
"SELECT param \ "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); msg.param.set_int(Param::GuaranteeE2ee, 1);
} }
} }