mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 01:06:04 +00:00
Code Issues Releases Wiki Activity

Skip signing drafts

Browse source
This commit is contained in:
M66B 2020-04-03 21:56:19 +02:00
parent 4dc119cf3d
commit 66b62d5077
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -4027,8 +4027,10 @@ public class FragmentCompose extends FragmentBase {
// Execute action
boolean encrypted = extras.getBoolean("encrypted");
boolean shouldEncrypt =
(draft.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt));
boolean shouldEncrypt = EntityMessage.PGP_SIGNENCRYPT.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) {
args.putBoolean("needsEncryption", true);
return draft;