Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-24 01:43:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent enabling encryption when not available

Browse Source
This commit is contained in:
M66B
2024-08-25 07:38:33 +02:00
parent 7598ba4b7f
commit 4e7e299d85
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -1560,6 +1560,16 @@ public class FragmentCompose extends FragmentBase {
draft.ui_encrypt = null;
}
if (!PgpHelper.isOpenKeychainInstalled(context) &&
(EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) ||
EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt)))
draft.ui_encrypt = null;
if (!ActivityBilling.isPro(context) &&
(EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)))
draft.ui_encrypt = null;
db.message().setMessageUiEncrypt(draft.id, draft.ui_encrypt);
db.message().setMessageSensitivity(draft.id, identity.sensitivity < 1 ? null : identity.sensitivity);
@@ -5670,15 +5680,21 @@ public class FragmentCompose extends FragmentBase {
data.draft.plain_only = 1;
if (encrypt_default || selected.encrypt_default)
if (selected.encrypt == 0)
data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
else
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
if (selected.encrypt == 0) {
if (PgpHelper.isOpenKeychainInstalled(context))
data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
} else {
if (ActivityBilling.isPro(context))
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
}
else if (sign_default || selected.sign_default)
if (selected.encrypt == 0)
data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
else
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
if (selected.encrypt == 0) {
if (PgpHelper.isOpenKeychainInstalled(context))
data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
} else {
if (ActivityBilling.isPro(context))
data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
}
}
if (receipt_default)