fix(job): only move if a mvbox folder is configured

Closes #100
This commit is contained in:
dignifiedquire
2019-05-29 00:30:07 +02:00
parent b296ccf5a5
commit 30195a3bfd

View File

@@ -485,48 +485,51 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
0 as *const libc::c_char, 0 as *const libc::c_char,
); );
let server_folder = CStr::from_ptr((*msg).server_folder).to_str().unwrap(); if !dest_folder.is_null() {
match inbox.mv( let server_folder = to_str((*msg).server_folder);
context,
server_folder, match inbox.mv(
(*msg).server_uid, context,
CStr::from_ptr(dest_folder).to_str().unwrap(), server_folder,
&mut dest_uid, (*msg).server_uid,
) as libc::c_uint to_str(dest_folder),
{ &mut dest_uid,
1 => { ) as libc::c_uint
current_block = 6379107252614456477; {
match current_block { 1 => {
12072121998757195963 => { current_block = 6379107252614456477;
dc_update_server_uid( match current_block {
context, 12072121998757195963 => {
(*msg).rfc724_mid, dc_update_server_uid(
dest_folder, context,
dest_uid, (*msg).rfc724_mid,
); dest_folder,
} dest_uid,
_ => { );
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); }
_ => {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
}
} }
} }
} 3 => {
3 => { current_block = 12072121998757195963;
current_block = 12072121998757195963; match current_block {
match current_block { 12072121998757195963 => {
12072121998757195963 => { dc_update_server_uid(
dc_update_server_uid( context,
context, (*msg).rfc724_mid,
(*msg).rfc724_mid, dest_folder,
dest_folder, dest_uid,
dest_uid, );
); }
} _ => {
_ => { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); }
} }
} }
0 | 2 | _ => {}
} }
0 | 2 | _ => {}
} }
} }
} }
@@ -589,12 +592,13 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
b"configured_mvbox_folder\x00" as *const u8 as *const libc::c_char, b"configured_mvbox_folder\x00" as *const u8 as *const libc::c_char,
0 as *const libc::c_char, 0 as *const libc::c_char,
); );
let dest_folder = CStr::from_ptr(dest_folder).to_str().unwrap(); if !dest_folder.is_null() {
match inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) as libc::c_uint { let dest_folder = to_str(dest_folder);
1 => { if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid)
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); as libc::c_uint
{
dc_job_try_again_later(job, 3, 0 as *const libc::c_char);
} }
0 | _ => {}
} }
} }
} }