From dbdea787a7ce856d7024375769252c5d6a5ea302 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 30 Oct 2020 19:02:10 +0100 Subject: [PATCH 1/2] fix typo that results in a not-working test --- src/dc_receive_imf.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 0419c3427..cc503d3af 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -2227,7 +2227,7 @@ mod tests { let t = TestContext::new_alice().await; // create one-to-one with bob, archive one-to-one - let bob_id = Contact::create(&t.ctx, "bob", "bob@exampel.org") + let bob_id = Contact::create(&t.ctx, "bob", "bob@example.com") .await .unwrap(); let one2one_id = chat::create_by_contact_id(&t.ctx, bob_id).await.unwrap(); From 46833ca4f27cf6d3ecdafd994bcdb56fe95a829f Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 30 Oct 2020 19:03:02 +0100 Subject: [PATCH 2/2] do not unarchive one-to-one on receiving read-receipts --- src/dc_receive_imf.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index cc503d3af..9c19fbbf4 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -772,9 +772,6 @@ async fn add_parts( *sent_timestamp = std::cmp::min(*sent_timestamp, rcvd_timestamp); - // unarchive chat - chat_id.unarchive(context).await?; - // if the mime-headers should be saved, find out its size // (the mime-header ends with an empty line) let save_mime_headers = context.get_config_bool(Config::SaveMimeHeaders).await; @@ -896,6 +893,10 @@ async fn add_parts( *insert_msg_id = *id; } + if !is_hidden { + chat_id.unarchive(context).await?; + } + *hidden = is_hidden; created_db_entries.extend(ids.iter().map(|id| (chat_id, *id))); mime_parser.parts = new_parts;