From 2fddb290068086d830d9fd3f68b96ae481c233b0 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 18 Jan 2020 10:54:19 +0100 Subject: [PATCH] Added option to disable send reminders --- .../eu/faircode/email/FragmentCompose.java | 5 +++- .../faircode/email/FragmentOptionsSend.java | 12 ++++++++- .../main/res/layout/fragment_options_send.xml | 25 ++++++++++++++++++- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index cf41d1bbfa..352b162fdc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3734,11 +3734,14 @@ public class FragmentCompose extends FragmentBase { boolean remind_subject = args.getBoolean("remind_subject", 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 || remind_subject || remind_text || remind_attachment || recipients > RECIPIENTS_WARNING) { + if (dialog || (send_reminders && + (remind_subject || remind_text || remind_attachment || recipients > RECIPIENTS_WARNING))) { setBusy(false); FragmentDialogSend fragment = new FragmentDialogSend(); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index 6f9238e502..65dfbd7ea2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -56,6 +56,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc private SwitchCompat swResizeAttachments; private Spinner spAutoResize; private TextView tvAutoResize; + private SwitchCompat swSendReminders; private SwitchCompat swReceipt; private SwitchCompat swLookupMx; private Spinner spSendDelayed; @@ -64,7 +65,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc "keyboard", "suggest_sent", "suggested_received", "prefix_once", "extended_reply", "quote_reply", "plain_only", "usenet_signature", - "resize_images", "resize_attachments", "receipt_default", "resize", "lookup_mx", "send_delayed" + "resize_images", "resize_attachments", "send_reminders", "receipt_default", "resize", "lookup_mx", "send_delayed" }; @Override @@ -90,6 +91,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc swResizeAttachments = view.findViewById(R.id.swResizeAttachments); spAutoResize = view.findViewById(R.id.spAutoResize); tvAutoResize = view.findViewById(R.id.tvAutoResize); + swSendReminders = view.findViewById(R.id.swSendReminders); swReceipt = view.findViewById(R.id.swReceipt); swLookupMx = view.findViewById(R.id.swLookupMx); spSendDelayed = view.findViewById(R.id.spSendDelayed); @@ -201,6 +203,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc } }); + swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("send_reminders", checked).apply(); + } + }); + swLookupMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -289,6 +298,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc } spAutoResize.setEnabled(swResizeImages.isChecked() || swResizeAttachments.isChecked()); + swSendReminders.setChecked(prefs.getBoolean("send_reminders", true)); swReceipt.setChecked(prefs.getBoolean("receipt_default", false)); swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false)); diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml index db2cffb797..c201e238a4 100644 --- a/app/src/main/res/layout/fragment_options_send.xml +++ b/app/src/main/res/layout/fragment_options_send.xml @@ -195,6 +195,29 @@ app:layout_constraintStart_toEndOf="@id/spAutoResize" app:layout_constraintTop_toTopOf="@id/spAutoResize" /> + + + + Automatically resize embedded images Automatically resize image attachments < %1$d pixels + Show reminders Check recipient email addresses before sending Delay sending messages @@ -412,6 +413,7 @@ In addition to contacts provided by Android. Contact data will be stored for newly sent or received messages only when enabled. Insert \'-- \' between the text and the signature + Show a warning when the message text or the subject is empty or when an attachment might be missing This will check if DNS MX records exist This will check if domain name of the sender and reply addresses are the same