Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 23:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

- Don't pass EncryptionModus by reference

Browse Source 
- rename get_encryption_modus() to encryption_modus()
This commit is contained in:
jikstra
2022-11-18 03:06:40 +01:00
parent bc4eea0c28
commit 7533f863d1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat.rs
View File

@@ -926,7 +926,7 @@ impl ChatId {
pub async fn set_encryption_modus( pub async fn set_encryption_modus(
self, self,
context: &Context, context: &Context,
modus: &EncryptionModus, modus: EncryptionModus,
) -> Result<()> { ) -> Result<()> {
context context
.sql .sql
@@ -941,7 +941,7 @@ impl ChatId {
/// This sets a protection modus for the chat and enforces that messages are only send if they /// This sets a protection modus for the chat and enforces that messages are only send if they
/// meet the encryption modus (ForcePlaintext, Opportunistic, ForceEncrypted, ForceVerified) /// meet the encryption modus (ForcePlaintext, Opportunistic, ForceEncrypted, ForceVerified)
pub async fn get_encryption_modus(self, context: &Context) -> Result<Option<EncryptionModus>> { pub async fn encryption_modus(self, context: &Context) -> Result<Option<EncryptionModus>> {
let encryption_modus: Option<EncryptionModus> = context let encryption_modus: Option<EncryptionModus> = context
.sql .sql
.query_get_value( .query_get_value(
@@ -2001,8 +2001,8 @@ pub async fn is_contact_in_chat(
pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> { pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> {
// Propagate same encryption_mode of chat to message in case messages doesn't yet have an // Propagate same encryption_mode of chat to message in case messages doesn't yet have an
// encryption_mode // encryption_mode
if let None = msg.get_encryption_modus(&context).await? { if let None = msg.encryption_modus(&context).await? {
if let Some(encryption_mode) = chat_id.get_encryption_modus(&context).await? { if let Some(encryption_mode) = chat_id.encryption_modus(&context).await? {
msg.set_encryption_modus(&context, encryption_mode); msg.set_encryption_modus(&context, encryption_mode);
} }
} }

6
src/message.rs
View File

@@ -855,10 +855,10 @@ impl Message {
self.param.set_int(Param::ForcePlaintext, 1); self.param.set_int(Param::ForcePlaintext, 1);
} }
async fn set_encryption_modus( pub async fn set_encryption_modus(
&mut self, &mut self,
context: &Context, context: &Context,
encryption_modus: &EncryptionModus, encryption_modus: EncryptionModus,
) -> Result<()> { ) -> Result<()> {
context context
.sql .sql
@@ -871,7 +871,7 @@ impl Message {
Ok(()) Ok(())
} }
pub async fn get_encryption_modus(&self, context: &Context) -> Result<Option<EncryptionModus>> { pub async fn encryption_modus(&self, context: &Context) -> Result<Option<EncryptionModus>> {
let encryption_modus: Option<EncryptionModus> = context let encryption_modus: Option<EncryptionModus> = context
.sql .sql
.query_get_value( .query_get_value(

2
src/mimefactory.rs
View File

@@ -605,7 +605,7 @@ impl<'a> MimeFactory<'a> {
let min_verified = self.min_verified(); let min_verified = self.min_verified();
let grpimage = self.grpimage(); let grpimage = self.grpimage();
let encryption_modus = match self.msg.get_encryption_modus(context).await? { let encryption_modus = match self.msg.encryption_modus(context).await? {
Some(encryption_modus) => encryption_modus, Some(encryption_modus) => encryption_modus,
None => EncryptionModus::Opportunistic, None => EncryptionModus::Opportunistic,
}; };