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

Return Result from dc_initiate_key_transfer

Browse Source
This commit is contained in:
Alexander Krotov
2019-09-27 17:11:32 +03:00
committed by holger krekel
parent 6c9c21c135
commit f346a052c1
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_imex.rs
View File

@@ -75,11 +75,9 @@ pub fn dc_imex_has_backup(context: &Context, dir_name: impl AsRef<Path>) -> Resu
}
}
pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
pub fn dc_initiate_key_transfer(context: &Context) -> Result<String> {
let mut msg: Message;
if !dc_alloc_ongoing(context) {
return std::ptr::null_mut();
}
ensure!(dc_alloc_ongoing(context), "could not allocate ongoing");
let setup_code = dc_create_setup_code(context);
/* this may require a keypair to be created. this may take a second ... */
if !context
@@ -149,7 +147,7 @@ pub unsafe fn dc_initiate_key_transfer(context: &Context) -> *mut libc::c_char {
}
dc_free_ongoing(context);
setup_code.strdup()
Ok(setup_code)
}
/// Renders HTML body of a setup file message.