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

make single-folder to use configurable

Browse source
This commit is contained in:
B. Petersen 2018-10-24 22:04:02 +02:00
parent 9bbf349315
commit 8412e2e45b
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
2 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dc_context.c
View file

@ -416,6 +416,7 @@ static char* get_sys_config_str(const char* key)
* - `send_pw` = SMTP-password, guessed if left out
* - `send_port` = SMTP-port, guessed if left out
* - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
* - `imap_folder` = IMAP-folder to use, defaults to `INBOX`
* - `displayname` = Own name to use when sending messages. MUAs are allowed to spread this way eg. using CC, defaults to empty
* - `selfstatus` = Own status to display eg. in email footers, defaults to a standard text
* - `selfavatar` = File containing avatar. Will be copied to blob directory.
@ -515,6 +516,9 @@ char* dc_get_config(dc_context_t* context, const char* key)
else if (strcmp(key, "mdns_enabled")==0) {
value = dc_mprintf("%i", DC_MDNS_DEFAULT_ENABLED);
}
else if (strcmp(key, "imap_folder")==0) {
value = dc_strdup("INBOX");
}
else {
value = dc_mprintf("");
}

48
src/dc_imap.c
View file

@ -516,8 +516,11 @@ cleanup:
int dc_imap_fetch(dc_imap_t* imap)
{
int success = 0;
char* imap_folder = NULL;
if (imap==NULL || !imap->connected) {
return 0;
goto cleanup;
}
setup_handle_if_needed(imap);
@ -525,15 +528,20 @@ int dc_imap_fetch(dc_imap_t* imap)
// as during the fetch commands, new messages may arrive, we fetch until we do not
// get any more. if IDLE is called directly after, there is only a small chance that
// messages are missed and delayed until the next IDLE call
while (fetch_from_single_folder(imap, "INBOX") > 0) {
imap_folder = imap->get_config(imap, "imap_folder", "INBOX");
while (fetch_from_single_folder(imap, imap_folder) > 0) {
;
}
return 1;
success = 1;
cleanup:
free(imap_folder);
return success;
}
static void fake_idle(dc_imap_t* imap)
static void fake_idle(dc_imap_t* imap, const char* imap_folder)
{
/* Idle using timeouts. This is also needed if we're not yet configured -
in this case, we're waiting for a configure job */
@ -572,7 +580,7 @@ static void fake_idle(dc_imap_t* imap)
// are also downloaded, however, typically this would take place in the FETCH command
// following IDLE otherwise, so this seems okay here.
if (setup_handle_if_needed(imap)) { // the handle may not be set up if configure is not yet done
if (fetch_from_single_folder(imap, "INBOX")) {
if (fetch_from_single_folder(imap, imap_folder)) {
do_fake_idle = 0;
}
}
@ -588,8 +596,15 @@ static void fake_idle(dc_imap_t* imap)
void dc_imap_idle(dc_imap_t* imap)
{
int r = 0;
int r2 = 0;
int r = 0;
int r2 = 0;
char* imap_folder = NULL;
if (imap==NULL) {
goto cleanup;
}
imap_folder = imap->get_config(imap, "imap_folder", "INBOX");
if (imap->can_idle)
{
@ -599,23 +614,23 @@ void dc_imap_idle(dc_imap_t* imap)
r = mailstream_setup_idle(imap->etpan->imap_stream);
if (is_error(imap, r)) {
dc_log_warning(imap->context, 0, "IMAP-IDLE: Cannot setup.");
fake_idle(imap);
return;
fake_idle(imap, imap_folder);
goto cleanup;
}
imap->idle_set_up = 1;
}
if (!imap->idle_set_up || !select_folder(imap, "INBOX")) {
if (!imap->idle_set_up || !select_folder(imap, imap_folder)) {
dc_log_warning(imap->context, 0, "IMAP-IDLE not setup.");
fake_idle(imap);
return;
fake_idle(imap, imap_folder);
goto cleanup;
}
r = mailimap_idle(imap->etpan);
if (is_error(imap, r)) {
dc_log_warning(imap->context, 0, "IMAP-IDLE: Cannot start.");
fake_idle(imap);
return;
fake_idle(imap, imap_folder);
goto cleanup;
}
// most servers do not allow more than ~28 minutes; stay clearly below that.
@ -645,8 +660,11 @@ void dc_imap_idle(dc_imap_t* imap)
}
else
{
fake_idle(imap);
fake_idle(imap, imap_folder);
}
cleanup:
free(imap_folder);
}