Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move most of the dc_receive_backup() into a safe function

Browse Source
This commit is contained in:
link2xt
2023-03-23 08:47:33 +00:00
parent c42d942460
commit f033aae25c
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
deltachat-ffi/src/lib.rs
View File

@@ -4233,6 +4233,21 @@ pub unsafe extern "C" fn dc_backup_provider_unref(provider: *mut dc_backup_provi
drop(Box::from_raw(provider)); drop(Box::from_raw(provider));
} }
fn receive_backup(ctx: Context, qr_text: String) -> libc::c_int {
let qr = match block_on(qr::check_qr(&ctx, &qr_text)).log_err(&ctx, "Invalid QR code") {
Ok(qr) => qr,
Err(_) => return 0,
};
spawn(async move {
let ctx = ctx;
imex::get_backup(&ctx, qr)
.await
.log_err(&ctx, "Get backup failed")
.ok();
});
1
}
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_receive_backup( pub unsafe extern "C" fn dc_receive_backup(
context: *mut dc_context_t, context: *mut dc_context_t,
@@ -4244,19 +4259,7 @@ pub unsafe extern "C" fn dc_receive_backup(
} }
let ctx = &*context; let ctx = &*context;
let qr_text = to_string_lossy(qr); let qr_text = to_string_lossy(qr);
let qr = match block_on(qr::check_qr(ctx, &qr_text)).log_err(ctx, "Invalid QR code") { receive_backup(ctx.clone(), qr_text)
Ok(qr) => qr,
Err(_) => return 0,
};
let ctx = ctx.clone();
spawn(async move {
let ctx = ctx;
imex::get_backup(&ctx, qr)
.await
.log_err(&ctx, "Get backup failed")
.ok();
});
1
} }
trait ResultExt<T, E> { trait ResultExt<T, E> {