From c96ee382660c320a8c9398b3a880075bb9fc28d7 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 15 May 2018 22:56:03 +0200 Subject: [PATCH] allow adding members-without-peerstate to a group, fixes https://github.com/deltachat/deltachat-android/issues/306 --- src/mrmailbox.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mrmailbox.c b/src/mrmailbox.c index 1f729438..ab8a6940 100644 --- a/src/mrmailbox.c +++ b/src/mrmailbox.c @@ -3187,14 +3187,13 @@ int mrmailbox_add_contact_to_chat4(mrmailbox_t* mailbox, uint32_t chat_id, uint3 } else { - if( !mrapeerstate_load_by_addr__(peerstate, mailbox->m_sql, contact->m_addr) ) { - goto cleanup; - } - - if( chat->m_type==MR_CHAT_TYPE_VERIFIED_GROUP - && mrcontact_is_verified__(contact, peerstate)!=MRV_BIDIRECTIONAL ) { - mrmailbox_log_error(mailbox, 0, "Only bidirectional verified contacts can be added to verfied groups."); - goto cleanup; + if( chat->m_type == MR_CHAT_TYPE_VERIFIED_GROUP ) + { + if( !mrapeerstate_load_by_addr__(peerstate, mailbox->m_sql, contact->m_addr) + || mrcontact_is_verified__(contact, peerstate) != MRV_BIDIRECTIONAL ) { + 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) ) {