yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 12:00:11 +02:00
Code Issues Releases Wiki Activity

allow adding members-without-peerstate to a group, fixes https://github.com/deltachat/deltachat-android/issues/306

Browse source
This commit is contained in:
B. Petersen 2018-05-15 22:56:03 +02:00
parent e8dbd860f1
commit c96ee38266
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/mrmailbox.c
View file

@ -3187,14 +3187,13 @@ int mrmailbox_add_contact_to_chat4(mrmailbox_t* mailbox, uint32_t chat_id, uint3
} }
else else
{ {
if( !mrapeerstate_load_by_addr__(peerstate, mailbox->m_sql, contact->m_addr) ) { if( chat->m_type == MR_CHAT_TYPE_VERIFIED_GROUP )
goto cleanup; {
} if( !mrapeerstate_load_by_addr__(peerstate, mailbox->m_sql, contact->m_addr)
|| mrcontact_is_verified__(contact, peerstate) != MRV_BIDIRECTIONAL ) {
if( chat->m_type==MR_CHAT_TYPE_VERIFIED_GROUP mrmailbox_log_error(mailbox, 0, "Only bidirectional verified contacts can be added to verfied groups.");
&& mrcontact_is_verified__(contact, peerstate)!=MRV_BIDIRECTIONAL ) { goto cleanup;
mrmailbox_log_error(mailbox, 0, "Only bidirectional verified contacts can be added to verfied groups."); }
goto cleanup;
} }
if( 0==mrmailbox_add_to_chat_contacts_table__(mailbox, chat_id, contact_id) ) { if( 0==mrmailbox_add_to_chat_contacts_table__(mailbox, chat_id, contact_id) ) {