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

go to correct step so that param_autoconfig is actually used

Browse Source
This commit is contained in:
B. Petersen
2019-12-13 22:55:34 +01:00
committed by holger krekel
parent ce37a8dda2
commit 95fbc904d1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/configure/mod.rs
View File

@@ -94,7 +94,8 @@ pub fn JobConfigureImap(context: &Context) {
"Internal Error: this value should never be used".to_owned(); "Internal Error: this value should never be used".to_owned();
let mut keep_flags = 0; let mut keep_flags = 0;
const STEP_AFTER_AUTOCONFIG: u8 = 12; const STEP_12_USE_AUTOCONFIG: u8 = 12;
const STEP_13_AFTER_AUTOCONFIG: u8 = 13;
let mut step_counter: u8 = 0; let mut step_counter: u8 = 0;
while !context.shall_stop_ongoing() { while !context.shall_stop_ongoing() {
@@ -161,11 +162,11 @@ pub fn JobConfigureImap(context: &Context) {
if let Some(new_param) = get_offline_autoconfig(context, &param) { if let Some(new_param) = get_offline_autoconfig(context, &param) {
// 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);
step_counter = STEP_AFTER_AUTOCONFIG; step_counter = STEP_12_USE_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
} }
} else { } else {
// advanced parameters entered by the user: skip Autoconfig // advanced parameters entered by the user: skip Autoconfig
step_counter = STEP_AFTER_AUTOCONFIG; step_counter = STEP_13_AFTER_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
} }
true true
} }
@@ -251,9 +252,9 @@ pub fn JobConfigureImap(context: &Context) {
true true
} }
/* C. Do we have any autoconfig result? /* C. Do we have any autoconfig result?
If you change the match-number here, also update STEP_AFTER_AUTOCONFIG above If you change the match-number here, also update STEP_12_COPY_AUTOCONFIG above
*/ */
12 => { STEP_12_USE_AUTOCONFIG => {
progress!(context, 500); progress!(context, 500);
if let Some(ref cfg) = param_autoconfig { if let Some(ref cfg) = param_autoconfig {
info!(context, "Got autoconfig: {}", &cfg); info!(context, "Got autoconfig: {}", &cfg);
@@ -273,7 +274,8 @@ pub fn JobConfigureImap(context: &Context) {
true true
} }
// Step 3: Fill missing fields with defaults // Step 3: Fill missing fields with defaults
13 => { // If you change the match-number here, also update STEP_13_AFTER_AUTOCONFIG above
STEP_13_AFTER_AUTOCONFIG => {
if param.mail_server.is_empty() { if param.mail_server.is_empty() {
param.mail_server = format!("imap.{}", param_domain,) param.mail_server = format!("imap.{}", param_domain,)
} }