Decide on chat assignment before contact lookup

src/mimefactory/mimefactory_tests.rs

@@ -339,39 +339,31 @@ async fn test_subject_in_group() -> Result<()> {
     }
 
     // 6. Test that in a group, replies also take the quoted message's subject, while non-replies use the group title as subject
-    let t = TestContext::new_alice().await;
-    let bob = TestContext::new_bob().await;
-    let group_id = chat::create_group_chat(&t, chat::ProtectionStatus::Unprotected, "groupname") // TODO encodings, ä
+    let mut tcm = TestContextManager::new();
+    let t = tcm.alice().await;
+    let bob = tcm.bob().await;
+    let group_id = chat::create_group_chat(&t, chat::ProtectionStatus::Unprotected, "groupname")
         .await
         .unwrap();
     let bob_contact_id = t.add_or_lookup_contact_id(&bob).await;
     chat::add_contact_to_chat(&t, group_id, bob_contact_id).await?;
 
+    let sent_message = t.send_text(group_id, "Hello!").await;
+    let bob_received_message = bob.recv_msg(&sent_message).await;
+    let bob_group_id = bob_received_message.chat_id;
+    bob_group_id.accept(&bob).await.unwrap();
+    assert_eq!(get_subject(&t, sent_message).await?, "groupname");
+
     let subject = send_msg_get_subject(&t, group_id, None).await?;
-    assert_eq!(subject, "groupname");
+    assert_eq!(subject, "Re: groupname");
 
     let subject = send_msg_get_subject(&t, group_id, None).await?;
     assert_eq!(subject, "Re: groupname");
 
-    receive_imf(
-        &t,
-        format!(
-            "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
-                From: [email protected]\n\
-                To: [email protected]\n\
-                Subject: Different subject\n\
-                In-Reply-To: {}\n\
-                Message-ID: <[email protected]>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n",
-            t.get_last_msg().await.rfc724_mid
-        )
-        .as_bytes(),
-        false,
-    )
-    .await?;
-    let message_from_bob = t.get_last_msg().await;
+    let mut msg = Message::new(Viewtype::Text);
+    msg.set_subject("Different subject".to_string());
+    let bob_sent_msg = bob.send_msg(bob_group_id, &mut msg).await;
+    let message_from_bob = t.recv_msg(&bob_sent_msg).await;
 
     let subject = send_msg_get_subject(&t, group_id, None).await?;
     assert_eq!(subject, "Re: groupname");

src/mimeparser.rs

@@ -1526,16 +1526,6 @@ impl MimeMessage {
         remove_header(headers, "chat-verified", removed);
         remove_header(headers, "autocrypt-gossip", removed);
 
-        // Chat-Group-ID can only appear in encrypted messages
-        // since PGP-contact migration.
-        //
-        // Unencrypted ad hoc groups do not have group IDs.
-        //
-        // If we receive a Chat-Group-ID header in unencrypted message,
-        // it is likely sent by old version in opportunistically
-        // encrypted group that dropped to unencrypted.
-        remove_header(headers, "chat-group-id", removed);
-
         // Secure-Join is secured unless it is an initial "vc-request"/"vg-request".
         if let Some(secure_join) = remove_header(headers, "secure-join", removed) {
             if secure_join == "vc-request" || secure_join == "vg-request" {

src/reaction.rs

@@ -980,10 +980,11 @@ Here's my footer -- [email protected]"
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_send_reaction_multidevice() -> Result<()> {
-        let alice0 = TestContext::new_alice().await;
-        let alice1 = TestContext::new_alice().await;
-        let bob_id = Contact::create(&alice0, "", "[email protected]").await?;
-        let chat_id = ChatId::create_for_contact(&alice0, bob_id).await?;
+        let mut tcm = TestContextManager::new();
+        let alice0 = tcm.alice().await;
+        let alice1 = tcm.alice().await;
+        let bob = tcm.bob().await;
+        let chat_id = alice0.create_chat(&bob).await.id;
 
         let alice0_msg_id = send_text_msg(&alice0, chat_id, "foo".to_string()).await?;
         let alice1_msg = alice1.recv_msg(&alice0.pop_sent_msg().await).await;