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

use tri-state ImageAction instead of Option<Option>

Browse Source
This commit is contained in:
B. Petersen
2019-12-09 16:23:59 +01:00
committed by holger krekel
parent c62532a665
commit c3fd0889e2
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/contact.rs
View File

@@ -15,6 +15,7 @@ use crate::events::Event;
use crate::key::*;
use crate::login_param::LoginParam;
use crate::message::{MessageState, MsgId};
use crate::mimeparser::ImageAction;
use crate::param::*;
use crate::peerstate::*;
use crate::sql;
@@ -965,17 +966,26 @@ fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
pub fn set_profile_image(
context: &Context,
contact_id: u32,
profile_image: Option<String>,
profile_image: ImageAction,
) -> Result<()> {
// the given profile image is expected to be already in the blob directory
// as profile images can be set only by receiving messages, this should be always the case, however.
let mut contact = Contact::load_from_db(context, contact_id)?;
match profile_image {
Some(profile_image) => contact.param.set(Param::ProfileImage, profile_image),
None => contact.param.remove(Param::ProfileImage),
let changed = match profile_image {
ImageAction::Change(profile_image) => {
contact.param.set(Param::ProfileImage, profile_image);
true
}
ImageAction::Delete => {
contact.param.remove(Param::ProfileImage);
true
}
ImageAction::None => false,
};
contact.update_param(context)?;
context.call_cb(Event::ContactsChanged(Some(contact_id)));
if changed {
contact.update_param(context)?;
context.call_cb(Event::ContactsChanged(Some(contact_id)));
}
Ok(())
}