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

Start working on fixing blocking provider info

Browse Source
This commit is contained in:
jikstra
2022-03-04 00:07:03 -05:00
parent 7c4a6ddcdf
commit 420a9fbd9f
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3930,33 +3930,42 @@ pub type dc_provider_t = provider::Provider;
pub unsafe extern "C" fn dc_provider_new_from_email( pub unsafe extern "C" fn dc_provider_new_from_email(
context: *const dc_context_t, context: *const dc_context_t,
addr: *const libc::c_char, addr: *const libc::c_char,
) -> *const dc_provider_t { ) {
if context.is_null() || addr.is_null() { if context.is_null() || addr.is_null() {
eprintln!("ignoring careless call to dc_provider_new_from_email()"); eprintln!("ignoring careless call to dc_provider_new_from_email()");
return ptr::null(); return;
} }
let addr = to_string_lossy(addr); let addr = to_string_lossy(addr);
let ctx = &*context;
let socks5_enabled = block_on(async move {
ctx.get_config_bool(config::Config::Socks5Enabled)
.await
.log_err(ctx, "Can't get config")
});
match socks5_enabled { async_std::task::spawn(async move {
Ok(socks5_enabled) => { let ctx = &*context;
match block_on(provider::get_provider_info( let socks5_enabled = ctx.get_config_bool(config::Config::Socks5Enabled)
ctx, .await
addr.as_str(), .log_err(ctx, "Can't get config");
socks5_enabled, match socks5_enabled {
)) { Ok(socks5_enabled) => {
Some(provider) => provider, match provider::get_provider_info(
None => ptr::null_mut(), ctx,
addr.as_str(),
socks5_enabled,
).await {
Some(provider) => {
// send event with provider info
},
None => {
// send event with provider info null
},
};
}
Err(err) => {
context.as_ref().unwrap().emit_event(EventType::Error(format!(
"Failed to get provider info: {:#}",
err
)));
} }
} }
Err(_) => ptr::null_mut(), });
}
} }
#[no_mangle] #[no_mangle]