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

Never ignore SQL errors when reading SOCKS5 settings

Browse Source 
Otherwise we may accidentally connect directly due to temporary error.
This commit is contained in:
link2xt
2021-08-22 18:29:51 +00:00
parent ab1de69fbc
commit 3aa2b57ac1
5 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,9 +311,12 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
let redirect = to_string_lossy(redirect);
block_on(async move {
match oauth2::dc_get_oauth2_url(ctx, &addr, &redirect).await {
Some(res) => res.strdup(),
None => ptr::null_mut(),
match oauth2::dc_get_oauth2_url(ctx, &addr, &redirect)
.await
.log_err(ctx, "dc_get_oauth2_url failed")
{
Ok(Some(res)) => res.strdup(),
Ok(None) | Err(_) => ptr::null_mut(),
}
})
}
@@ -3620,12 +3623,16 @@ pub unsafe extern "C" fn dc_provider_new_from_email(
ctx.get_config_bool(config::Config::Socks5Enabled)
.await
.log_err(ctx, "Can't get config")
.unwrap_or_default()
});
match block_on(provider::get_provider_info(addr.as_str(), socks5_enabled)) {
Some(provider) => provider,
None => ptr::null_mut(),
match socks5_enabled {
Ok(socks5_enabled) => {
match block_on(provider::get_provider_info(addr.as_str(), socks5_enabled)) {
Some(provider) => provider,
None => ptr::null_mut(),
}
}
Err(_) => ptr::null_mut(),
}
}