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

Some fixes

Browse Source
This commit is contained in:
Floris Bruynooghe
2023-02-20 12:58:23 +01:00
parent ada858f439
commit 3c4ffc3550
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4142,13 +4142,10 @@ pub unsafe extern "C" fn dc_backup_provider_new(
return ptr::null_mut(); return ptr::null_mut();
} }
let ctx = &*context; let ctx = &*context;
block_on(async move { block_on(BackupProvider::prepare(ctx))
BackupProvider::prepare(ctx) .map(|provider| Box::into_raw(Box::new(provider)))
.await .log_err(ctx, "BackupProvider failed")
.map(|provider| Box::into_raw(Box::new(provider))) .unwrap_or(ptr::null_mut())
.log_err(ctx, "BackupProvider failed")
.unwrap_or(ptr::null_mut())
})
} }
#[no_mangle] #[no_mangle]
@@ -4168,17 +4165,14 @@ pub unsafe extern "C" fn dc_backup_provider_qr_svg(
provider: *const dc_backup_provider_t, provider: *const dc_backup_provider_t,
) -> *mut libc::c_char { ) -> *mut libc::c_char {
if context.is_null() { if context.is_null() {
eprintln!("ignoring careless call to dc_send_backup()"); eprintln!("ignoring careless call to dc_backup_provider_qr_svg()");
return ptr::null_mut(); return ptr::null_mut();
} }
let ctx = &*context; let ctx = &*context;
let provider = &*provider; let provider = &*provider;
block_on(async move { block_on(generate_backup_qr(ctx, &provider.qr()))
generate_backup_qr(ctx, &provider.qr()) .unwrap_or_default()
.await .strdup()
.unwrap_or_default()
.strdup()
})
} }
#[no_mangle] #[no_mangle]
@@ -4187,18 +4181,14 @@ pub unsafe extern "C" fn dc_backup_provider_wait(
provider: *mut dc_backup_provider_t, provider: *mut dc_backup_provider_t,
) { ) {
if context.is_null() { if context.is_null() {
eprintln!("ignoring careless call to dc_send_backup()"); eprintln!("ignoring careless call to dc_backup_provider_wait()");
return; return;
} }
let ctx = &*context; let ctx = &*context;
let provider = Box::from_raw(provider); let provider = Box::from_raw(provider);
block_on(async move { block_on(provider.join())
provider .log_err(ctx, "Failed to join provider")
.join() .ok();
.await
.log_err(ctx, "Failed to join provider")
.ok();
});
} }
#[no_mangle] #[no_mangle]
@@ -4207,7 +4197,7 @@ pub unsafe extern "C" fn dc_receive_backup(
qr: *const libc::c_char, qr: *const libc::c_char,
) -> libc::c_int { ) -> libc::c_int {
if context.is_null() { if context.is_null() {
eprintln!("ignoring careless call to dc_send_backup()"); eprintln!("ignoring careless call to dc_receive_backup()");
return 0; return 0;
} }
let ctx = &*context; let ctx = &*context;