Don-t-reset-encryption-choice-when-disabling-encrypt.patch 1.1 KB
Newer Older
1
From 27470b650c59ab70580a93c5a69f54e7761764c6 Mon Sep 17 00:00:00 2001
2
3
4
5
6
7
8
9
10
11
12
13
From: anonym <anonym@riseup.net>
Date: Tue, 3 Nov 2020 12:13:10 +0100
Subject: [PATCH] Don't reset encryption choice when disabling encryption
 controls.

Without this, the mail.identity.default.encryptionpolicy pref does not
work: adding a key to an account always set its encryptionpolicy to 0
no matter the desired default.

While we're at it, also kill two lines of code before a call to
enableEncryptionControl() that exactly replicates it.
---
14
15
 comm/mail/extensions/am-e2e/am-e2e.js | 3 ---
 1 file changed, 3 deletions(-)
16
17

diff --git a/comm/mail/extensions/am-e2e/am-e2e.js b/comm/mail/extensions/am-e2e/am-e2e.js
18
index d70bd5d415b..d01d05c9b96 100644
19
20
--- a/comm/mail/extensions/am-e2e/am-e2e.js
+++ b/comm/mail/extensions/am-e2e/am-e2e.js
21
@@ -442,9 +442,6 @@ function smimeSelectCert(smime_cert) {
22
23
24
25
26
27
28
29
30
31
 function enableEncryptionControls(do_enable) {
   gRequireEncrypt.disabled = !do_enable;
   gDoNotEncrypt.disabled = !do_enable;
-  if (!do_enable) {
-    gEncryptionChoices.value = 0;
-  }
 }
 
 function enableSigningControls(do_enable) {
-- 
32
2.31.0
33