Remove last usage of E2eeEnabled

link2xt · link2xt · commit 652a58881084 · 2025-03-10T02:01:11.000Z
diff --git a/python/src/deltachat/testplugin.py b/python/src/deltachat/testplugin.py
@@ -423,8 +423,6 @@ def get_next_liveconfig(self):
         where we can make valid SMTP and IMAP connections with.
         """
         configdict = next(self._liveconfig_producer).copy()
-        if "e2ee_enabled" not in configdict:
-            configdict["e2ee_enabled"] = "1"
 
         if self.pytestconfig.getoption("--strict-tls"):
             # Enable strict certificate checks for online accounts
diff --git a/src/chat/chat_tests.rs b/src/chat/chat_tests.rs
@@ -299,10 +299,6 @@ async fn test_member_add_remove() -> Result<()> {
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
-    // Disable encryption so we can inspect raw message contents.
-    alice.set_config(Config::E2eeEnabled, Some("0")).await?;
-    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
-
     // Create contact for Bob on the Alice side with name "robert".
     let alice_bob_contact_id = Contact::create(&alice, "robert", "bob@example.net").await?;
 
@@ -373,9 +369,6 @@ async fn test_parallel_member_remove() -> Result<()> {
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
-    alice.set_config(Config::E2eeEnabled, Some("0")).await?;
-    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
-
     let alice_bob_contact_id = Contact::create(&alice, "Bob", "bob@example.net").await?;
     let alice_fiona_contact_id = Contact::create(&alice, "Fiona", "fiona@example.net").await?;
     let alice_claire_contact_id = Contact::create(&alice, "Claire", "claire@example.net").await?;
@@ -2681,7 +2674,6 @@ async fn test_chat_get_encryption_info() -> Result<()> {
             bob@example.net"
     );
 
-    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
     send_text_msg(&bob, direct_chat.id, "Hello!".to_string()).await?;
     alice.recv_msg(&bob.pop_sent_msg().await).await;
 
diff --git a/src/config/config_tests.rs b/src/config/config_tests.rs
@@ -86,7 +86,7 @@ async fn test_set_config_bool() -> Result<()> {
     let t = TestContext::new().await;
 
     // We need some config that defaults to true
-    let c = Config::E2eeEnabled;
+    let c = Config::MdnsEnabled;
     assert_eq!(t.get_config_bool(c).await?, true);
     t.set_config_bool(c, false).await?;
     assert_eq!(t.get_config_bool(c).await?, false);
diff --git a/src/configure.rs b/src/configure.rs
@@ -442,7 +442,6 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
         ctx.set_config(Config::MvboxMove, Some("0")).await?;
         ctx.set_config(Config::OnlyFetchMvbox, None).await?;
         ctx.set_config(Config::ShowEmails, None).await?;
-        ctx.set_config(Config::E2eeEnabled, Some("1")).await?;
     }
 
     let create_mvbox = !is_chatmail;
diff --git a/src/context.rs b/src/context.rs
@@ -796,7 +796,6 @@ impl Context {
             .query_get_value("PRAGMA journal_mode;", ())
             .await?
             .unwrap_or_else(|| "unknown".to_string());
-        let e2ee_enabled = self.get_config_int(Config::E2eeEnabled).await?;
         let mdns_enabled = self.get_config_int(Config::MdnsEnabled).await?;
         let bcc_self = self.get_config_int(Config::BccSelf).await?;
         let sync_msgs = self.get_config_int(Config::SyncMsgs).await?;
@@ -937,7 +936,6 @@ impl Context {
         res.insert("configured_mvbox_folder", configured_mvbox_folder);
         res.insert("configured_trash_folder", configured_trash_folder);
         res.insert("mdns_enabled", mdns_enabled.to_string());
-        res.insert("e2ee_enabled", e2ee_enabled.to_string());
         res.insert("bcc_self", bcc_self.to_string());
         res.insert("sync_msgs", sync_msgs.to_string());
         res.insert("disable_idle", disable_idle.to_string());
diff --git a/src/e2ee.rs b/src/e2ee.rs
@@ -312,7 +312,6 @@ Sent with my Delta Chat Messenger: https://delta.chat";
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_should_encrypt() -> Result<()> {
         let t = TestContext::new_alice().await;
-        assert!(t.get_config_bool(Config::E2eeEnabled).await?);
         let encrypt_helper = EncryptHelper::new(&t).await.unwrap();
 
         let ps = new_peerstates(EncryptPreference::NoPreference);
@@ -335,60 +334,6 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         Ok(())
     }
 
-    // Tests that when encryption is not preferred, we encrypt anyway when we can.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_should_encrypt_e2ee_disabled() -> Result<()> {
-        let t = &TestContext::new_alice().await;
-        t.set_config_bool(Config::E2eeEnabled, false).await?;
-        let encrypt_helper = EncryptHelper::new(t).await.unwrap();
-
-        let ps = new_peerstates(EncryptPreference::NoPreference);
-        assert!(encrypt_helper.should_encrypt(t, false, &ps).await?);
-
-        let ps = new_peerstates(EncryptPreference::Reset);
-        assert!(encrypt_helper.should_encrypt(t, true, &ps).await?);
-
-        let mut ps = new_peerstates(EncryptPreference::Mutual);
-        assert!(encrypt_helper.should_encrypt(t, false, &ps).await?);
-
-        ps.push(ps[0].clone());
-        assert!(encrypt_helper.should_encrypt(t, false, &ps).await?);
-
-        // Test with missing peerstate.
-        let ps = vec![(None, "bob@foo.bar".to_string())];
-        assert!(encrypt_helper.should_encrypt(t, true, &ps).await.is_err());
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_chatmail_prefers_to_encrypt() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-        bob.set_config_bool(Config::IsChatmail, true).await?;
-
-        let bob_chat_id = tcm
-            .send_recv_accept(alice, bob, "Hello from DC")
-            .await
-            .chat_id;
-        receive_imf(
-            bob,
-            b"From: alice@example.org\n\
-            To: bob@example.net\n\
-            Message-ID: <2222@example.org>\n\
-            Date: Sun, 22 Mar 3000 22:37:58 +0000\n\
-            \n\
-            Hello from another MUA\n",
-            false,
-        )
-        .await?;
-        send_text_msg(bob, bob_chat_id, "hi".to_string()).await?;
-        let sent_msg = bob.pop_sent_msg().await;
-        let msg = Message::load_from_db(bob, sent_msg.sender_msg_id).await?;
-        assert!(msg.get_showpadlock());
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_chatmail_can_send_unencrypted() -> Result<()> {
         let mut tcm = TestContextManager::new();
diff --git a/src/imex.rs b/src/imex.rs
@@ -143,29 +143,6 @@ async fn set_self_key(context: &Context, armored: &str) -> Result<()> {
     // try hard to only modify key-state
     let (private_key, header) = SignedSecretKey::from_asc(armored)?;
     let public_key = private_key.split_public_key()?;
-    if let Some(preferencrypt) = header.get("Autocrypt-Prefer-Encrypt") {
-        let e2ee_enabled = match preferencrypt.as_str() {
-            "nopreference" => 0,
-            "mutual" => 1,
-            _ => {
-                bail!("invalid Autocrypt-Prefer-Encrypt header: {:?}", header);
-            }
-        };
-        context
-            .sql
-            .set_raw_config_int("e2ee_enabled", e2ee_enabled)
-            .await?;
-    } else {
-        // `Autocrypt-Prefer-Encrypt` is not included
-        // in keys exported to file.
-        //
-        // `Autocrypt-Prefer-Encrypt` also SHOULD be sent
-        // in Autocrypt Setup Message according to Autocrypt specification,
-        // but K-9 6.802 does not include this header.
-        //
-        // We keep current setting in this case.
-        info!(context, "No Autocrypt-Prefer-Encrypt header.");
-    };
 
     let keypair = pgp::KeyPair {
         public: public_key,
diff --git a/src/webxdc/webxdc_tests.rs b/src/webxdc/webxdc_tests.rs
@@ -1648,29 +1648,26 @@ async fn test_webxdc_no_internet_access() -> Result<()> {
     let group_id = create_group_chat(&t, ProtectionStatus::Unprotected, "chat").await?;
     let broadcast_id = create_broadcast_list(&t).await?;
 
-    for e2ee in ["1", "0"] {
-        t.set_config(Config::E2eeEnabled, Some(e2ee)).await?;
-        for chat_id in [self_id, single_id, group_id, broadcast_id] {
-            for internet_xdc in [true, false] {
-                let mut instance = create_webxdc_instance(
-                    &t,
-                    "foo.xdc",
-                    if internet_xdc {
-                        include_bytes!("../../test-data/webxdc/request-internet-access.xdc")
-                    } else {
-                        include_bytes!("../../test-data/webxdc/minimal.xdc")
-                    },
-                )?;
-                let instance_id = send_msg(&t, chat_id, &mut instance).await?;
-                t.send_webxdc_status_update(
-                    instance_id,
-                    r#"{"summary":"real summary", "payload": 42}"#,
-                )
-                .await?;
-                let instance = Message::load_from_db(&t, instance_id).await?;
-                let info = instance.get_webxdc_info(&t).await?;
-                assert_eq!(info.internet_access, false);
-            }
+    for chat_id in [self_id, single_id, group_id, broadcast_id] {
+        for internet_xdc in [true, false] {
+            let mut instance = create_webxdc_instance(
+                &t,
+                "foo.xdc",
+                if internet_xdc {
+                    include_bytes!("../../test-data/webxdc/request-internet-access.xdc")
+                } else {
+                    include_bytes!("../../test-data/webxdc/minimal.xdc")
+                },
+            )?;
+            let instance_id = send_msg(&t, chat_id, &mut instance).await?;
+            t.send_webxdc_status_update(
+                instance_id,
+                r#"{"summary":"real summary", "payload": 42}"#,
+            )
+            .await?;
+            let instance = Message::load_from_db(&t, instance_id).await?;
+            let info = instance.get_webxdc_info(&t).await?;
+            assert_eq!(info.internet_access, false);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,6 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure`
`442`	`442`	`ctx.set_config(Config::MvboxMove, Some("0")).await?;`
`443`	`443`	`ctx.set_config(Config::OnlyFetchMvbox, None).await?;`
`444`	`444`	`ctx.set_config(Config::ShowEmails, None).await?;`
`445`		`- ctx.set_config(Config::E2eeEnabled, Some("1")).await?;`
`446`	`445`	`}`
`447`	`446`
`448`	`447`	`let create_mvbox = !is_chatmail;`