Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

sync encrypted avatars only

Browse Source
This commit is contained in:
B. Petersen
2020-07-15 02:28:30 +02:00
parent 964f60ff4b
commit 6e6823f395
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/contact.rs
View File

@@ -1100,14 +1100,19 @@ pub(crate) async fn set_profile_image(
context: &Context,
contact_id: u32,
profile_image: &AvatarAction,
was_encrypted: bool,
) -> Result<()> {
let mut contact = Contact::load_from_db(context, contact_id).await?;
let changed = match profile_image {
AvatarAction::Change(profile_image) => {
if contact_id == DC_CONTACT_ID_SELF {
context
.set_config(Config::Selfavatar, Some(profile_image))
.await?;
if was_encrypted {
context
.set_config(Config::Selfavatar, Some(profile_image))
.await?;
} else {
info!(context, "Do not use unencrypted selfavatar.");
}
} else {
contact.param.set(Param::ProfileImage, profile_image);
}
@@ -1115,7 +1120,11 @@ pub(crate) async fn set_profile_image(
}
AvatarAction::Delete => {
if contact_id == DC_CONTACT_ID_SELF {
context.set_config(Config::Selfavatar, None).await?;
if was_encrypted {
context.set_config(Config::Selfavatar, None).await?;
} else {
info!(context, "Do not use unencrypted selfavatar deletion.");
}
} else {
contact.param.remove(Param::ProfileImage);
}

9
src/dc_receive_imf.rs
View File

@@ -197,7 +197,14 @@ pub async fn dc_receive_imf(
}
if let Some(avatar_action) = &mime_parser.user_avatar {
match contact::set_profile_image(&context, from_id, avatar_action).await {
match contact::set_profile_image(
&context,
from_id,
avatar_action,
mime_parser.was_encrypted(),
)
.await
{
Ok(()) => {
context.emit_event(Event::ChatModified(chat_id));
}