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

dc_reveive_backup() ffi just takes the qr-code again instead of several parameters

Browse Source
This commit is contained in:
B. Petersen
2022-07-14 20:17:08 +02:00
committed by dignifiedquire
parent 0ed3348bdf
commit 411d0a7cd4
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ mod lot;
mod string;
use self::string::*;
use deltachat::chatlist::Chatlist;
use deltachat::qr::Qr;
// as C lacks a good and portable error handling,
// in general, the C Interface is forgiving wrt to bad parameters.
@@ -2271,18 +2272,18 @@ pub unsafe extern "C" fn dc_backup_sender_unref(bs: *mut dc_backup_sender) {
#[no_mangle]
pub unsafe extern "C" fn dc_receive_backup(
ctx: *mut dc_context_t,
ticket: *const libc::c_char,
qr: *const libc::c_char,
passphrase: *const libc::c_char,
) {
if ctx.is_null() || ticket.is_null() {
if ctx.is_null() {
eprintln!("ignoring careless call to dc_receive_backup");
return;
}
let ctx = &*ctx;
let ticket = multibase::decode(to_string_lossy(ticket))
.map(|(_, ticket)| ticket)
.unwrap_or_default();
let ticket = match block_on(qr::check_qr(ctx, &to_string_lossy(qr))) {
Ok(Qr::Backup { ticket }) => ticket.as_bytes(),
_ => vec![],
};
let passphrase = to_opt_string_lossy(passphrase);
spawn(async move {