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

show better error message for a simple 'bad credentials' error and give some more hints for other errors

Browse Source
This commit is contained in:
B. Petersen
2019-10-09 01:27:13 +02:00
committed by holger krekel
parent 469f8ac31d
commit 27627b4f74
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/imap.rs
View File

@@ -16,6 +16,7 @@ use crate::login_param::{dc_build_tls, CertificateChecks, LoginParam};
use crate::message::{self, update_msg_move_state, update_server_uid};
use crate::oauth2::dc_get_oauth2_access_token;
use crate::param::Params;
use crate::stock::StockMessage;
use crate::wrapmime;
const DC_IMAP_SEEN: usize = 0x0001;
@@ -445,15 +446,14 @@ impl Imap {
let config = self.config.read().unwrap();
let imap_server: &str = config.imap_server.as_ref();
let imap_port = config.imap_port;
emit_event!(
context,
Event::ErrorNetwork(format!(
"Could not connect to IMAP-server {}:{}. ({})",
imap_server, imap_port, err
))
let message = context.stock_string_repl_str2(
StockMessage::ServerResponse,
format!("{}:{}", imap_server, imap_port),
format!("{}", err),
);
emit_event!(context, Event::ErrorNetwork(message));
return false;
}
};
@@ -467,9 +467,13 @@ impl Imap {
true
}
Err((err, _)) => {
let config = self.config.read().unwrap();
let imap_user: &str = config.imap_user.as_ref();
let message = context.stock_string_repl_str(StockMessage::CannotLogin, imap_user);
emit_event!(
context,
Event::ErrorNetwork(format!("Cannot login ({})", err))
Event::ErrorNetwork(format!("{} ({})", message, err))
);
self.unsetup_handle(context);