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

Make it work

Browse Source 
Add a mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messeges being sent.

Do not mute the device chat but "only" send MsgsChanged event when no
notification shall be shown.

More logging.
This commit is contained in:
Hocuri
2020-06-13 19:45:59 +02:00
parent 3f2e67f07a
commit 2c23433185
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/chat.rs
View File

@@ -2698,14 +2698,7 @@ pub async fn add_device_msg_with_importance(
let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
msg.try_calc_and_set_dimensions(context).await.ok();
prepare_msg_blob(context, msg).await?;
chat_id.unarchive(context).await?;
let muted = if important {
MuteDuration::NotMuted
} else {
MuteDuration::Forever
};
set_muted(context, chat_id, muted).await?;
context.sql.execute(
"INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,param,rfc724_mid) \
@@ -2741,7 +2734,11 @@ pub async fn add_device_msg_with_importance(
}
if !msg_id.is_unset() {
context.emit_event(Event::IncomingMsg { chat_id, msg_id });
if important {
context.emit_event(Event::IncomingMsg { chat_id, msg_id });
} else {
context.emit_event(Event::MsgsChanged { chat_id, msg_id });
}
}
Ok(msg_id)