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

api(ffi): store reference-counted Context in dc_contact_t

Browse Source
This commit is contained in:
link2xt
2026-08-02 17:22:56 +00:00
committed by l
parent abfc1b9a76
commit e1f5858fa3
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deltachat-ffi/src/lib.rs
+17 -16
View File
@@ -2286,12 +2286,17 @@ pub unsafe extern "C" fn dc_get_contact(
eprintln!("ignoring careless call to dc_get_contact()");
return ptr::null_mut();
}
let ctx = unsafe { &*context };
let context = unsafe { &*context };
block_on(async move {
Contact::get_by_id(ctx, ContactId::new(contact_id))
Contact::get_by_id(context, ContactId::new(contact_id))
.await
.map(|contact| Box::into_raw(Box::new(ContactWrapper { context, contact })))
.map(|contact| {
Box::into_raw(Box::new(ContactWrapper {
context: context.clone(),
contact,
}))
})
.unwrap_or_else(|_| ptr::null_mut())
})
}
@@ -3914,7 +3919,7 @@ pub unsafe extern "C" fn dc_msg_get_saved_msg_id(msg: *const dc_msg_t) -> u32 {
/// context, but the Rust API does not, so the FFI layer needs to glue
/// these together.
pub struct ContactWrapper {
context: *const dc_context_t,
context: Context,
contact: contact::Contact,
}
@@ -4002,10 +4007,9 @@ pub unsafe extern "C" fn dc_contact_get_profile_image(
return ptr::null_mut(); // NULL explicitly defined as "no profile image"
}
let ffi_contact = unsafe { &*contact };
let ctx = unsafe { &*ffi_contact.context };
block_on(ffi_contact.contact.get_profile_image(ctx))
.unwrap_or_log_default(ctx, "failed to get profile image")
block_on(ffi_contact.contact.get_profile_image(&ffi_contact.context))
.unwrap_or_log_default(&ffi_contact.context, "failed to get profile image")
.map(|p| p.to_string_lossy().strdup())
.unwrap_or_else(std::ptr::null_mut)
}
@@ -4017,15 +4021,14 @@ pub unsafe extern "C" fn dc_contact_get_color(contact: *mut dc_contact_t) -> u32
return 0;
}
let ffi_contact = unsafe { &*contact };
let ctx = unsafe { &*ffi_contact.context };
block_on(
ffi_contact
.contact
// We don't want any UIs displaying gray self-color.
.get_or_gen_color(ctx),
.get_or_gen_color(&ffi_contact.context),
)
.context("Contact::get_color()")
.log_err(ctx)
.log_err(&ffi_contact.context)
.unwrap_or(0)
}
@@ -4076,11 +4079,10 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
return 0;
}
let ffi_contact = unsafe { &*contact };
let ctx = unsafe { &*ffi_contact.context };
if block_on(ffi_contact.contact.is_verified(ctx))
if block_on(ffi_contact.contact.is_verified(&ffi_contact.context))
.context("is_verified failed")
.log_err(ctx)
.log_err(&ffi_contact.context)
.unwrap_or_default()
{
// Return value is essentially a boolean,
@@ -4116,10 +4118,9 @@ pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t)
return 0;
}
let ffi_contact = unsafe { &*contact };
let ctx = unsafe { &*ffi_contact.context };
let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(ctx))
let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(&ffi_contact.context))
.context("failed to get verifier")
.log_err(ctx)
.log_err(&ffi_contact.context)
.unwrap_or_default()
.unwrap_or_default()
.unwrap_or_default();