|
|
@ -3418,11 +3418,13 @@ public class FragmentCompose extends FragmentBase {
|
|
|
|
data.draft.plain_only = true;
|
|
|
|
data.draft.plain_only = true;
|
|
|
|
|
|
|
|
|
|
|
|
// Encryption
|
|
|
|
// Encryption
|
|
|
|
if (ref.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(ref.ui_encrypt)) {
|
|
|
|
if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) ||
|
|
|
|
if (ActivityBilling.isPro(context))
|
|
|
|
EntityMessage.PGP_SIGNENCRYPT.equals(ref.ui_encrypt)) {
|
|
|
|
if (Helper.isOpenKeychainInstalled(context) ||
|
|
|
|
if (Helper.isOpenKeychainInstalled(context) && selected.sign_key != null)
|
|
|
|
EntityMessage.SMIME_SIGNONLY.equals(ref.encrypt) ||
|
|
|
|
data.draft.ui_encrypt = ref.ui_encrypt;
|
|
|
|
EntityMessage.SMIME_SIGNENCRYPT.equals(ref.encrypt))
|
|
|
|
} else if (EntityMessage.SMIME_SIGNONLY.equals(ref.ui_encrypt) ||
|
|
|
|
|
|
|
|
EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) {
|
|
|
|
|
|
|
|
if (ActivityBilling.isPro(context) && selected.sign_key_alias != null)
|
|
|
|
data.draft.ui_encrypt = ref.ui_encrypt;
|
|
|
|
data.draft.ui_encrypt = ref.ui_encrypt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|