fix: allow to securejoin groups with 1:1 contact request from inviter

deltachat-rpc-client/tests/test_securejoin.py

@@ -60,6 +60,33 @@ def test_qr_securejoin(acfactory):
     assert bob_contact_alice_snapshot.is_verified
 
 
+def test_qr_securejoin_contact_request(acfactory) -> None:
+    """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
+    alice, bob = acfactory.get_online_accounts(2)
+
+    bob_addr = bob.get_config("addr")
+    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_chat_bob = alice_contact_bob.create_chat()
+    alice_chat_bob.send_text("Hello!")
+
+    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Hello!"
+    bob_chat_alice = snapshot.chat
+    assert bob_chat_alice.get_basic_snapshot().is_contact_request
+
+    alice_chat = alice.create_group("Verified group", protect=True)
+    logging.info("Bob joins verified group")
+    qr_code, _svg = alice_chat.get_qr_code()
+    bob.secure_join(qr_code)
+    while True:
+        event = bob.wait_for_event()
+        if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
+            break
+
+    # Chat stays being a contact request.
+    assert bob_chat_alice.get_basic_snapshot().is_contact_request
+
+
 def test_verified_group_recovery(acfactory, rpc) -> None:
     ac1, ac2, ac3 = acfactory.get_online_accounts(3)
 

src/chat.rs

@@ -2439,10 +2439,13 @@ async fn prepare_msg_common(
 
     // Check if the chat can be sent to.
     if let Some(reason) = chat.why_cant_send(context).await? {
-        if reason == CantSendReason::ProtectionBroken
+        if matches!(
-            && msg.param.get_cmd() == SystemMessage::SecurejoinMessage
+            reason,
+            CantSendReason::ProtectionBroken | CantSendReason::ContactRequest
+        ) && msg.param.get_cmd() == SystemMessage::SecurejoinMessage
         {
-            // Send out the message, the securejoin message is supposed to repair the verification
+            // Send out the message, the securejoin message is supposed to repair the verification.
+            // If the chat is a contact request, let the user accept it later.
         } else {
             bail!("cannot send to {chat_id}: {reason}");
         }