From 14adcdb51749739c38c9e1531c5e133965b60b2b Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 6 Nov 2023 11:45:39 +0000 Subject: [PATCH] fix: treat reset state as encryption not preferred This will still degrade 1:1 chats to no encryption, but will not cause the group to disable encryption simply because one user got into reset state. --- src/e2ee.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/e2ee.rs b/src/e2ee.rs index 6a966b488..9b95c2879 100644 --- a/src/e2ee.rs +++ b/src/e2ee.rs @@ -67,13 +67,8 @@ impl EncryptHelper { "peerstate for {:?} is {}", addr, peerstate.prefer_encrypt ); match peerstate.prefer_encrypt { - EncryptPreference::NoPreference => {} + EncryptPreference::NoPreference | EncryptPreference::Reset => {} EncryptPreference::Mutual => prefer_encrypt_count += 1, - EncryptPreference::Reset => { - if !e2ee_guaranteed { - return Ok(false); - } - } }; } None => {