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

do autoconfig only when no advanced options are entered

Browse Source 
the advanced options are not used anyway later,
but prevent imap/smtp connections from being altered.

nb: we want to stop altering when some advanced options
are entered, however, we want to do this probaby
not depending on autoconfig.
This commit is contained in:
B. Petersen
2020-05-29 17:26:47 +02:00
committed by dignifiedquire
parent 408e9946af
commit 84963e198e
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/configure/mod.rs
View File

@@ -121,7 +121,6 @@ impl Context {
async fn configure(ctx: &Context, imap: &mut Imap, param: &mut LoginParam) -> Result<()> { async fn configure(ctx: &Context, imap: &mut Imap, param: &mut LoginParam) -> Result<()> {
let mut param_autoconfig: Option<LoginParam> = None; let mut param_autoconfig: Option<LoginParam> = None;
let mut keep_flags = 0; let mut keep_flags = 0;
let mut use_autoconfig = true;
// Read login parameters from the database // Read login parameters from the database
progress!(ctx, 1); progress!(ctx, 1);
@@ -170,18 +169,15 @@ async fn configure(ctx: &Context, imap: &mut Imap, param: &mut LoginParam) -> Re
// got parameters from our provider-database, skip Autoconfig, preserve the OAuth2 setting // got parameters from our provider-database, skip Autoconfig, preserve the OAuth2 setting
param_autoconfig = Some(new_param); param_autoconfig = Some(new_param);
} }
} else {
// advanced parameters entered by the user: skip Autoconfig
use_autoconfig = false;
}
if param_autoconfig.is_none() { if param_autoconfig.is_none() {
param_autoconfig = get_autoconfig(ctx, param, &param_domain, &param_addr_urlencoded).await; param_autoconfig =
get_autoconfig(ctx, param, &param_domain, &param_addr_urlencoded).await;
}
} }
// C. Do we have any autoconfig result? // C. Do we have any autoconfig result?
progress!(ctx, 500); progress!(ctx, 500);
if use_autoconfig {
if let Some(ref cfg) = param_autoconfig { if let Some(ref cfg) = param_autoconfig {
info!(ctx, "Got autoconfig: {}", &cfg); info!(ctx, "Got autoconfig: {}", &cfg);
if !cfg.mail_user.is_empty() { if !cfg.mail_user.is_empty() {
@@ -198,7 +194,6 @@ async fn configure(ctx: &Context, imap: &mut Imap, param: &mut LoginParam) -> Re
// it is used to later to prevent trying variations of port/server/logins // it is used to later to prevent trying variations of port/server/logins
} }
param.server_flags |= keep_flags; param.server_flags |= keep_flags;
}
// Step 3: Fill missing fields with defaults // Step 3: Fill missing fields with defaults
if param.mail_server.is_empty() { if param.mail_server.is_empty() {