Commit 02fbe5ea authored by intrigeri's avatar intrigeri

Revert "Ask for disable Autocrypt for existing accounts (refs: #16299)"

At this point it's unclear whether there's a problem to solve
(https://redmine.tails.boum.org/code/issues/16299#note-20)
and if there's one, whether this is the best way to solve it
(https://redmine.tails.boum.org/code/issues/16299#note-19).

This reverts commit a2bb3bf0.
parent 2bb6dfed
......@@ -4,10 +4,6 @@ set -e
set -u
set -x
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
# Import set_mozilla_pref()
. /usr/local/lib/tails-shell-library/tor-browser.sh
......@@ -29,40 +25,12 @@ configure_locale() {
user_pref
}
prompt_for_disable_autocrypt() {
local server="${1}"
local dialog_msg="`eval_gettext \"<b><big>Do you want disable Autocrypt?</big></b>
You have Autocrypt enabled for <i>\\\${server}</i>.
Autocrypt is a quite new feature, that should help you encrypting without even think about it.
In the past, there were cases, where unencrypted messages were sent unexpectitly.
Tails recommend to disable Autocrypt for the moment, but you can still keep it enabled, if you know what you do.
Do you want to disable Autocrypt for <i>\\\${server}</i>?\"`
"
local disable="`gettext \"Disable\"`"
local keep="`gettext \"Keep enabled\"`"
zenity --question --title "" --text "${dialog_msg}" --default-ok \
--ok-label "${disable}" --cancel-label "${keep}"
}
disable_autocrypt() {
# Disable Autocrypt since it is not safe (#15923).
set_mozilla_pref "${PROFILE}/prefs.js" \
"mail.server.default.enableAutocrypt" \
"false" \
user_pref
# Search all accounts, where Autocrypt is enabled and ask for disable Autocrypt.
enabledAccountsAutocrypt=`sed -n -E 's/.*\("mail\.server\.(server[0-9]+)\.enableAutocrypt"\s*,\s*true\s*\);\s*/\1/p' "${PROFILE}/prefs.js"`
for server in ${enabledAccountsAutocrypt}; do
if prompt_for_disable_autocrypt "${server}"; then
set_mozilla_pref "${PROFILE}/prefs.js" \
"mail.server.${server}.enableAutocrypt" \
"false" \
user_pref
fi
done
}
configure_default_incoming_protocol() {
......
......@@ -15,7 +15,6 @@ tmp/pot/tails-spoof-mac.pot
tmp/pot/tails-screen-locker.pot
tmp/pot/tails-upgrade-frontend-wrapper.pot
tmp/pot/tails-virt-notify-user.pot
tmp/pot/thunderbird.pot
tmp/pot/tor-browser.pot
tmp/pot/torstatus-extension.js.pot
tmp/pot/unsafe-browser.pot
......
......@@ -21,7 +21,6 @@ PYTHON_PROGS="/etc/whisperback/config.py \
SHELL_PROGS="/etc/NetworkManager/dispatcher.d/60-tor-ready.sh \
/usr/local/bin/keepassx \
/usr/local/lib/tails-spoof-mac \
/usr/local/bin/thunderbird \
/usr/local/bin/tor-browser \
/usr/local/sbin/unsafe-browser"
JAVASCRIPT_PROGS=" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment