mirror of
https://github.com/chatmail/core.git
synced 2026-05-05 06:16:30 +03:00
refactor: rename icon-address-contact to icon-unencrypted
The icon is mainly used to identify unencrypted chats in the chatlist where encrypted and unencrypted chats are mixed. It is used for group chats rather than only for 1:1 chats with address-contacts.
This commit is contained in:
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
10
src/chat.rs
10
src/chat.rs
@@ -1784,7 +1784,7 @@ impl Chat {
|
|||||||
// This is an address-contact chat, show a special avatar that marks it as such
|
// This is an address-contact chat, show a special avatar that marks it as such
|
||||||
return Ok(Some(get_abs_path(
|
return Ok(Some(get_abs_path(
|
||||||
context,
|
context,
|
||||||
Path::new(&get_address_contact_icon(context).await?),
|
Path::new(&get_unencrypted_icon(context).await?),
|
||||||
)));
|
)));
|
||||||
} else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
|
} else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
|
||||||
// Load the group avatar, or the device-chat / saved-messages icon
|
// Load the group avatar, or the device-chat / saved-messages icon
|
||||||
@@ -2490,11 +2490,13 @@ pub(crate) async fn get_archive_icon(context: &Context) -> Result<PathBuf> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn get_address_contact_icon(context: &Context) -> Result<PathBuf> {
|
/// Returns path to the icon
|
||||||
|
/// indicating unencrypted chats and address-contacts.
|
||||||
|
pub(crate) async fn get_unencrypted_icon(context: &Context) -> Result<PathBuf> {
|
||||||
get_asset_icon(
|
get_asset_icon(
|
||||||
context,
|
context,
|
||||||
"icon-address-contact",
|
"icon-unencrypted",
|
||||||
include_bytes!("../assets/icon-address-contact.png"),
|
include_bytes!("../assets/icon-unencrypted.png"),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1564,7 +1564,7 @@ impl Contact {
|
|||||||
return Ok(Some(chat::get_device_icon(context).await?));
|
return Ok(Some(chat::get_device_icon(context).await?));
|
||||||
}
|
}
|
||||||
if show_fallback_icon && !self.id.is_special() && !self.is_key_contact() {
|
if show_fallback_icon && !self.id.is_special() && !self.is_key_contact() {
|
||||||
return Ok(Some(chat::get_address_contact_icon(context).await?));
|
return Ok(Some(chat::get_unencrypted_icon(context).await?));
|
||||||
}
|
}
|
||||||
if let Some(image_rel) = self.param.get(Param::ProfileImage) {
|
if let Some(image_rel) = self.param.get(Param::ProfileImage) {
|
||||||
if !image_rel.is_empty() {
|
if !image_rel.is_empty() {
|
||||||
|
|||||||
Reference in New Issue
Block a user