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

address @flub's review comment from https://github.com/deltachat/deltachat-core-rust/pull/622

Browse Source
This commit is contained in:
holger krekel
2019-09-28 02:45:28 +02:00
parent 3a16ad89bd
commit ca76cac314
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/securejoin.rs
View File

@@ -718,21 +718,24 @@ fn encrypted_and_signed(mimeparser: &MimeParser, expected_fingerprint: impl AsRe
}
}
pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) {
pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) -> Result<(), Error> {
// - we do not issue an warning for DC_DE_ENCRYPTION_PAUSED as this is quite normal
// - currently, we do not issue an extra warning for DC_DE_VERIFICATION_LOST - this always comes
// together with DC_DE_FINGERPRINT_CHANGED which is logged, the idea is not to bother
// with things they cannot fix, so the user is just kicked from the verified group
// (and he will know this and can fix this)
if Some(DegradeEvent::FingerprintChanged) == peerstate.degrade_event {
let contact_id: i32 = context
.sql
.query_get_value(
context,
"SELECT id FROM contacts WHERE addr=?;",
params![&peerstate.addr],
)
.unwrap_or_default();
let contact_id: i32 = match context.sql.query_get_value(
context,
"SELECT id FROM contacts WHERE addr=?;",
params![&peerstate.addr],
) {
None => bail!(
"contact with peerstate.addr {:?} not found",
&peerstate.addr
),
Some(contact_id) => contact_id,
};
if contact_id > 0 {
let (contact_chat_id, _) =
chat::create_or_lookup_by_contact_id(context, contact_id as u32, Blocked::Deaddrop)
@@ -748,4 +751,5 @@ pub fn handle_degrade_event(context: &Context, peerstate: &Peerstate) {
emit_event!(context, Event::ChatModified(contact_chat_id));
}
}
Ok(())
}