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

Merge pull request #1375 from deltachat/robust-hide-device-expired-messages

Browse Source 
Make "hide_device_expired_messages" more robust
This commit is contained in:
bjoern
2020-04-03 11:48:09 +02:00
committed by GitHub
parent 3163ef87c6 9c2a3b8a82
commit 6e35a879a3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat.rs
View File

@@ -1620,8 +1620,12 @@ pub fn hide_device_expired_messages(context: &Context) -> Result<bool, Error> {
if let Some(delete_device_after) = context.get_config_delete_device_after() { if let Some(delete_device_after) = context.get_config_delete_device_after() {
let threshold_timestamp = time() - delete_device_after; let threshold_timestamp = time() - delete_device_after;
let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)?.0; let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)
let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)?.0; .unwrap_or_default()
.0;
let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
.unwrap_or_default()
.0;
// Hide expired messages // Hide expired messages
// //

4
src/chatlist.rs
View File

@@ -94,7 +94,9 @@ impl Chatlist {
) -> Result<Self> { ) -> Result<Self> {
// Note that we do not emit DC_EVENT_MSGS_MODIFIED here even if some // Note that we do not emit DC_EVENT_MSGS_MODIFIED here even if some
// messages get hidden to avoid reloading the same chatlist. // messages get hidden to avoid reloading the same chatlist.
hide_device_expired_messages(context)?; if let Err(err) = hide_device_expired_messages(context) {
warn!(context, "Failed to hide expired messages: {}", err);
}
let mut add_archived_link_item = false; let mut add_archived_link_item = false;