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

do not raise an error on poll/connect if the mailbox is not configured (this is very usual on first program start)

Browse source
This commit is contained in:
B. Petersen 2018-05-23 16:17:55 +02:00
parent 06bf3c003f
commit 8df8cc8729
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/mrmailbox_connect.c
View file

@ -45,7 +45,7 @@ void mrmailbox_ll_connect_to_imap(mrmailbox_t* mailbox, mrjob_t* job /*may be NU
is_locked = 1;
if( mrsqlite3_get_config_int__(mailbox->m_sql, "configured", 0) == 0 ) {
mrmailbox_log_error(mailbox, 0, "Not configured.");
mrmailbox_log_warning(mailbox, 0, "Not configured, cannot connect."); // this is no error, connect() is called eg. when the screen is switched on, it's okay if the caller does not check all circumstances here
goto cleanup;
}
@ -176,7 +176,7 @@ int mrmailbox_poll(mrmailbox_t* mailbox)
is_locked = 1;
if( mrsqlite3_get_config_int__(mailbox->m_sql, "configured", 0) == 0 ) {
mrmailbox_log_error(mailbox, 0, "Not configured.");
mrmailbox_log_warning(mailbox, 0, "Not configured, cannot poll."); // this is no error, pull() is called eg. from a timer, it's okay if the caller does not check all circumstances here
goto cleanup;
}

2
src/mrmailbox_securejoin.c
View file

@ -393,7 +393,7 @@ char* mrmailbox_get_securejoin_qr(mrmailbox_t* mailbox, uint32_t group_chat_id)
}
if( (self_addr = mrsqlite3_get_config__(mailbox->m_sql, "configured_addr", NULL)) == NULL ) {
mrmailbox_log_error(mailbox, 0, "Not configured.");
mrmailbox_log_error(mailbox, 0, "Not configured, cannot generate QR code.");
goto cleanup;
}