diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-07-24 09:31:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 09:31:17 -0700 |
| commit | 62b778180f46c3ee706657437b413acda098eef0 (patch) | |
| tree | a22c6c25941b3bf9b8b32044f51b6260963aa31d /alot/commands/globals.py | |
| parent | fd7ff0d15674a4cd1100f660d55c0b20a151a557 (diff) | |
| parent | 70010c0225dbfdebe0813b74354283ba6fcee514 (diff) | |
Merge pull request #1252 from pazz/update-envelope-keys
fix: automatically update envelope gpg keys only if requested. see #1228
Diffstat (limited to 'alot/commands/globals.py')
| -rw-r--r-- | alot/commands/globals.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/alot/commands/globals.py b/alot/commands/globals.py index 293d4925..06d0d5ce 100644 --- a/alot/commands/globals.py +++ b/alot/commands/globals.py @@ -17,7 +17,7 @@ from twisted.internet import threads from . import Command, registerCommand from . import CommandCanceled -from .utils import set_encrypt +from .utils import update_keys from .. import commands from .. import buffers @@ -916,12 +916,12 @@ class ComposeCommand(Command): logging.debug("Trying to encrypt message because encrypt=%s and " "encrypt_by_default=%s", self.encrypt, account.encrypt_by_default) - yield set_encrypt(ui, self.envelope, block_error=self.encrypt) + yield update_keys(ui, self.envelope, block_error=self.encrypt) elif account.encrypt_by_default == u"trusted": logging.debug("Trying to encrypt message because " "account.encrypt_by_default=%s", account.encrypt_by_default) - yield set_encrypt(ui, self.envelope, block_error=self.encrypt, + yield update_keys(ui, self.envelope, block_error=self.encrypt, signed_only=True) else: logging.debug("No encryption by default, encrypt_by_default=%s", |