1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00

Skip signing drafts

This commit is contained in:
M66B 2020-04-03 21:56:19 +02:00
parent 4dc119cf3d
commit 66b62d5077

View file

@ -4027,8 +4027,10 @@ public class FragmentCompose extends FragmentBase {
// Execute action // Execute action
boolean encrypted = extras.getBoolean("encrypted"); boolean encrypted = extras.getBoolean("encrypted");
boolean shouldEncrypt = boolean shouldEncrypt = EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt) ||
(draft.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt)); (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) && action == R.id.action_send) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt) ||
(EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) && action == R.id.action_send);
if (dirty && !encrypted && shouldEncrypt) { if (dirty && !encrypted && shouldEncrypt) {
args.putBoolean("needsEncryption", true); args.putBoolean("needsEncryption", true);
return draft; return draft;