Add prefer-encrypt prompt during account creation

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
index 42cf5d457ee580469914e2008403820465d2c1ae..5ccbf113097622f373f2a5e6e1a466d82bd8e143 100644 (file)
--- a/autocrypt/autocrypt.c
+++ b/autocrypt/autocrypt.c
@@ -111,6 +111,7 @@ int mutt_autocrypt_account_init(void)
   struct AutocryptAccount *account = NULL;
   bool done = false;
   int rc = -1;
+  int prefer_encrypt = 0;
 
   mutt_debug(LL_DEBUG1, "In mutt_autocrypt_account_init\n");
   if (mutt_yesorno(_("Create an initial autocrypt account?"), MUTT_YES) != MUTT_YES)
@@ -166,8 +167,18 @@ int mutt_autocrypt_account_init(void)
   if (mutt_autocrypt_gpgme_create_key(addr, keyid, keydata))
     goto cleanup;
 
-  /* TODO: prompt for prefer_encrypt value? */
-  if (mutt_autocrypt_db_account_insert(addr, mutt_b2s(keyid), mutt_b2s(keydata), 0))
+  /* L10N:
+     Autocrypt has a setting "prefer-encrypt".
+     When the recommendation algorithm returns "available" and BOTH
+     sender and recipient choose "prefer-encrypt", encryption will be
+     automatically enabled.
+     Otherwise the UI will show encryption is "available" but the user
+     will be required to enable encryption manually.
+  */
+  if (mutt_yesorno(_("Prefer encryption?"), MUTT_NO) == MUTT_YES)
+    prefer_encrypt = 1;
+
+  if (mutt_autocrypt_db_account_insert(addr, mutt_b2s(keyid), mutt_b2s(keydata), prefer_encrypt))
     goto cleanup;
 
   rc = 0;