mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed send dialog on encrypting

This commit is contained in:
M66B 2020-04-05 11:45:58 +02:00
parent 647353763f
commit 1231a03f3d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,7 @@ public class FragmentCompose extends FragmentBase {
onActionDiscard();
break;
case R.id.action_send:
onActionCheck();
onAction(R.id.action_check, "check");
break;
default:
onAction(action, "navigation");
@ -1515,15 +1515,6 @@ public class FragmentCompose extends FragmentBase {
}
}
private void onActionCheck() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean send_dialog = prefs.getBoolean("send_dialog", true);
Bundle extras = new Bundle();
extras.putBoolean("dialog", send_dialog);
onAction(R.id.action_check, extras, "check");
}
private void onEncrypt(final EntityMessage draft, final int action, final boolean interactive) {
if (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)) {
@ -4218,20 +4209,21 @@ public class FragmentCompose extends FragmentBase {
// Do nothing
} else if (action == R.id.action_check) {
boolean dialog = args.getBundle("extras").getBoolean("dialog");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean send_dialog = prefs.getBoolean("send_dialog", true);
boolean send_reminders = prefs.getBoolean("send_reminders", true);
boolean remind_to = args.getBoolean("remind_to", false);
boolean remind_extra = args.getBoolean("remind_extra", false);
boolean remind_subject = args.getBoolean("remind_subject", false);
boolean remind_pgp = args.getBoolean("remind_pgp", false);
boolean remind_text = args.getBoolean("remind_text", false);
boolean remind_attachment = args.getBoolean("remind_attachment", false);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean send_reminders = prefs.getBoolean("send_reminders", true);
int recipients = (draft.to == null ? 0 : draft.to.length) +
(draft.cc == null ? 0 : draft.cc.length) +
(draft.bcc == null ? 0 : draft.bcc.length);
if (dialog || (send_reminders &&
if (send_dialog || (send_reminders &&
(remind_to || remind_extra || remind_subject || remind_pgp || remind_text || remind_attachment ||
recipients > RECIPIENTS_WARNING))) {
setBusy(false);