mirror of
https://github.com/chatmail/core.git
synced 2026-05-04 05:46:29 +03:00
feat: Add Contact::get_or_gen_color. Use it in CFFI and JSON-RPC to avoid gray self-color (#7374)
`Contact::get_color()` returns gray if own keypair doesn't exist yet and we don't want any UIs displaying it. Keypair generation can't be done in `get_color()` or `get_by_id_optional()` to avoid breaking Core tests on key import. Also this makes the API clearer, pure getters shouldn't modify any visible state.
This commit is contained in:
@@ -1573,11 +1573,24 @@ impl Contact {
|
||||
}
|
||||
|
||||
/// Returns a color for the contact.
|
||||
/// See [`self::get_color`].
|
||||
/// For self-contact this returns gray if own keypair doesn't exist yet.
|
||||
/// See also [`self::get_color`].
|
||||
pub fn get_color(&self) -> u32 {
|
||||
get_color(self.id == ContactId::SELF, &self.addr, &self.fingerprint())
|
||||
}
|
||||
|
||||
/// Returns a color for the contact.
|
||||
/// Ensures that the color isn't gray. For self-contact this generates own keypair if it doesn't
|
||||
/// exist yet.
|
||||
/// See also [`self::get_color`].
|
||||
pub async fn get_or_gen_color(&self, context: &Context) -> Result<u32> {
|
||||
let mut fpr = self.fingerprint();
|
||||
if fpr.is_none() && self.id == ContactId::SELF {
|
||||
fpr = Some(load_self_public_key(context).await?.dc_fingerprint());
|
||||
}
|
||||
Ok(get_color(self.id == ContactId::SELF, &self.addr, &fpr))
|
||||
}
|
||||
|
||||
/// Gets the contact's status.
|
||||
///
|
||||
/// Status is the last signature received in a message from this contact.
|
||||
|
||||
Reference in New Issue
Block a user