Skip to content

Commit b00703c

Browse files
committed
fix: protect groups even if some members are not verified
1 parent 05e7835 commit b00703c

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

deltachat-rpc-client/tests/test_securejoin.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import logging
22

3-
import pytest
43
from deltachat_rpc_client import Chat, SpecialContactId
54

65

@@ -480,7 +479,6 @@ def test_gossip_verification(acfactory) -> None:
480479
assert carol_contact_alice_snapshot.is_verified
481480

482481

483-
@pytest.mark.xfail()
484482
def test_securejoin_after_contact_resetup(acfactory) -> None:
485483
"""
486484
Regression test for a bug that prevented joining verified group with a QR code

src/chat.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -502,15 +502,7 @@ impl ChatId {
502502

503503
match protect {
504504
ProtectionStatus::Protected => match chat.typ {
505-
Chattype::Single | Chattype::Group | Chattype::Broadcast => {
506-
let contact_ids = get_chat_contacts(context, self).await?;
507-
for contact_id in contact_ids {
508-
let contact = Contact::get_by_id(context, contact_id).await?;
509-
if !contact.is_verified(context).await? {
510-
bail!("{} is not verified.", contact.get_display_name());
511-
}
512-
}
513-
}
505+
Chattype::Single | Chattype::Group | Chattype::Broadcast => {}
514506
Chattype::Mailinglist => bail!("Cannot protect mailing lists"),
515507
},
516508
ProtectionStatus::Unprotected | ProtectionStatus::ProtectionBroken => {}

0 commit comments

Comments
 (0)