From cb0afe8b23df72ea369a441be240ee9fd59287c3 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Mon, 14 Apr 2025 12:43:44 +0200 Subject: [PATCH] Remove smtp_certificate_checks references --- deltachat-jsonrpc/src/lib.rs | 2 +- src/context/context_tests.rs | 1 - src/login_param.rs | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deltachat-jsonrpc/src/lib.rs b/deltachat-jsonrpc/src/lib.rs index 389206f46..3034c0f8b 100644 --- a/deltachat-jsonrpc/src/lib.rs +++ b/deltachat-jsonrpc/src/lib.rs @@ -85,7 +85,7 @@ mod tests { assert_eq!(result, response.to_owned()); } { - let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":""}]}"#; + let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":""}]}"#; let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#; session.handle_incoming(request).await; let result = receiver.recv().await?; diff --git a/src/context/context_tests.rs b/src/context/context_tests.rs index fbe0df584..92edd2f55 100644 --- a/src/context/context_tests.rs +++ b/src/context/context_tests.rs @@ -285,7 +285,6 @@ async fn test_get_info_completeness() { "send_security", "server_flags", "skip_start_messages", - "smtp_certificate_checks", "proxy_url", // May contain passwords, don't leak it to the logs. "socks5_enabled", // SOCKS5 options are deprecated. "socks5_host", diff --git a/src/login_param.rs b/src/login_param.rs index 71860cf3e..4ef016dec 100644 --- a/src/login_param.rs +++ b/src/login_param.rs @@ -171,8 +171,7 @@ impl EnteredLoginParam { // The setting is named `imap_certificate_checks` // for backwards compatibility, - // but now it is a global setting applied to all protocols, - // while `smtp_certificate_checks` is ignored. + // but now it is a global setting applied to all protocols. let certificate_checks = if let Some(certificate_checks) = context .get_config_parsed::(Config::ImapCertificateChecks) .await?