From ff1cca963b2acdbb1e47c9a6c7027343f2d461f2 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Tue, 9 Dec 2025 14:57:12 +0100 Subject: [PATCH 1/4] fix: remove now redundant "used_account_settings" from `Context.get_info()` --- src/context.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/context.rs b/src/context.rs index 737d66cd03..45090d0403 100644 --- a/src/context.rs +++ b/src/context.rs @@ -817,10 +817,6 @@ impl Context { /// Returns information about the context as key-value pairs. pub async fn get_info(&self) -> Result> { let l = EnteredLoginParam::load(self).await?; - let l2 = ConfiguredLoginParam::load(self).await?.map_or_else( - || "Not configured".to_string(), - |(_transport_id, param)| param.to_string(), - ); let secondary_addrs = self.get_secondary_self_addrs().await?.join(", "); let all_transports: Vec = ConfiguredLoginParam::load_all(self) .await? @@ -911,7 +907,6 @@ impl Context { ); res.insert("proxy_enabled", proxy_enabled.to_string()); res.insert("entered_account_settings", l.to_string()); - res.insert("used_account_settings", l2); res.insert("used_transport_settings", all_transports); if let Some(server_id) = &*self.server_id.read().await { From 16e19abae60a0941c21b987eec5a63c7a1bc6ff3 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Tue, 9 Dec 2025 15:12:13 +0100 Subject: [PATCH 2/4] also remove "entered_account_settings" --- src/context.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/context.rs b/src/context.rs index 45090d0403..eb079d9859 100644 --- a/src/context.rs +++ b/src/context.rs @@ -816,7 +816,6 @@ impl Context { /// Returns information about the context as key-value pairs. pub async fn get_info(&self) -> Result> { - let l = EnteredLoginParam::load(self).await?; let secondary_addrs = self.get_secondary_self_addrs().await?.join(", "); let all_transports: Vec = ConfiguredLoginParam::load_all(self) .await? @@ -906,7 +905,6 @@ impl Context { .unwrap_or_else(|| "".to_string()), ); res.insert("proxy_enabled", proxy_enabled.to_string()); - res.insert("entered_account_settings", l.to_string()); res.insert("used_transport_settings", all_transports); if let Some(server_id) = &*self.server_id.read().await { From 548929da6b9ee81ee9c7f15b130535329114a23c Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Tue, 9 Dec 2025 17:04:51 +0100 Subject: [PATCH 3/4] remove now unused import --- src/context.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/context.rs b/src/context.rs index eb079d9859..c4bd71c521 100644 --- a/src/context.rs +++ b/src/context.rs @@ -23,7 +23,6 @@ use crate::imap::{FolderMeaning, Imap, ServerMetadata}; use crate::key::self_fingerprint; use crate::log::warn; use crate::logged_debug_assert; -use crate::login_param::EnteredLoginParam; use crate::message::{self, MessageState, MsgId}; use crate::net::tls::TlsSessionStore; use crate::peer_channels::Iroh; From 2163dc1c8a364f66ad7b0bdc685032db7ced1f0b Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Fri, 12 Dec 2025 22:16:14 +0100 Subject: [PATCH 4/4] update tests --- deltachat-rpc-client/tests/test_something.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/deltachat-rpc-client/tests/test_something.py b/deltachat-rpc-client/tests/test_something.py index b272aa4d25..44cddb3070 100644 --- a/deltachat-rpc-client/tests/test_something.py +++ b/deltachat-rpc-client/tests/test_something.py @@ -90,12 +90,9 @@ def test_lowercase_address(acfactory) -> None: assert account.get_config("configured_addr") == addr assert account.list_transports()[0]["addr"] == addr - for param in [ - account.get_info()["used_account_settings"], - account.get_info()["entered_account_settings"], - ]: - assert addr in param - assert addr_upper not in param + param = account.get_info()["used_transport_settings"] + assert addr in param + assert addr_upper not in param def test_configure_ip(acfactory) -> None: @@ -733,7 +730,7 @@ def test_configured_imap_certificate_checks(acfactory): alice = acfactory.new_configured_account() # Certificate checks should be configured (not None) - assert "cert_strict" in alice.get_info().used_account_settings + assert "cert_strict" in alice.get_info().used_transport_settings # "cert_old_automatic" is the value old Delta Chat core versions used # to mean user entered "imap_certificate_checks=0" (Automatic) @@ -746,7 +743,7 @@ def test_configured_imap_certificate_checks(acfactory): # # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug. # This test is a regression test to prevent this happening again. - assert "cert_old_automatic" not in alice.get_info().used_account_settings + assert "cert_old_automatic" not in alice.get_info().used_transport_settings def test_no_old_msg_is_fresh(acfactory):