From 60c31b3aeb17f72b25097403f2e4f226e925429f Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 2 Feb 2021 11:16:14 +0100 Subject: [PATCH] Hard bounce --- app/src/main/java/eu/faircode/email/EntityMessage.java | 2 +- .../main/java/eu/faircode/email/FragmentCompose.java | 10 +++++----- .../main/java/eu/faircode/email/FragmentMessages.java | 6 +++--- app/src/main/java/eu/faircode/email/MessageHelper.java | 2 +- app/src/main/res/menu/popup_reply.xml | 4 ++-- app/src/main/res/values/strings.xml | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index df895b0354..e18d653631 100644 --- a/app/src/main/java/eu/faircode/email/EntityMessage.java +++ b/app/src/main/java/eu/faircode/email/EntityMessage.java @@ -104,7 +104,7 @@ public class EntityMessage implements Serializable { static final Integer DSN_NONE = 0; static final Integer DSN_RECEIPT = 1; - static final Integer DSN_ADDRESS_UNKNOWN = 2; + static final Integer DSN_HARD_BOUNCE = 2; static final Long SWIPE_ACTION_ASK = -1L; static final Long SWIPE_ACTION_SEEN = -2L; diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 0581f4d487..6e97f016e4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3626,7 +3626,7 @@ public class FragmentCompose extends FragmentBase { if (EntityMessage.DSN_RECEIPT.equals(dsn)) { if (ref.receipt_to != null) data.draft.to = ref.receipt_to; - } else if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn)) { + } else if (EntityMessage.DSN_HARD_BOUNCE.equals(dsn)) { if (ref.return_path != null) data.draft.to = ref.return_path; else if (BuildConfig.DEBUG) @@ -3741,14 +3741,14 @@ public class FragmentCompose extends FragmentBase { } else if ("list".equals(action)) { data.draft.subject = ref.subject; } else if ("dsn".equals(action)) { - if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn)) - data.draft.subject = context.getString(R.string.title_address_unknown_subject); + if (EntityMessage.DSN_HARD_BOUNCE.equals(dsn)) + data.draft.subject = context.getString(R.string.title_hard_bounce_subject); else data.draft.subject = context.getString(R.string.title_receipt_subject, subject); String[] texts; - if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn)) - texts = new String[]{context.getString(R.string.title_address_unknown_text)}; + if (EntityMessage.DSN_HARD_BOUNCE.equals(dsn)) + texts = new String[]{context.getString(R.string.title_hard_bounce_text)}; else texts = Helper.getStrings(context, ref.language, R.string.title_receipt_text); for (int i = 0; i < texts.length; i++) { diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 2d2abe7796..6ef4d2f41f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2431,7 +2431,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. popupMenu.getMenu().findItem(R.id.menu_reply_to_all).setVisible(recipients.length > 0); popupMenu.getMenu().findItem(R.id.menu_reply_list).setVisible(message.list_post != null); popupMenu.getMenu().findItem(R.id.menu_reply_receipt).setVisible(message.receipt_to != null); - popupMenu.getMenu().findItem(R.id.menu_reply_address_unknown) + popupMenu.getMenu().findItem(R.id.menu_reply_hard_bounce) .setVisible(experiments && (BuildConfig.DEBUG || (message.return_path != null && message.return_path.length > 0))); popupMenu.getMenu().findItem(R.id.menu_new_message).setVisible(to != null && to.length > 0); @@ -2477,8 +2477,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. case R.id.menu_reply_receipt: onMenuDsn(message, EntityMessage.DSN_RECEIPT); return true; - case R.id.menu_reply_address_unknown: - onMenuDsn(message, EntityMessage.DSN_ADDRESS_UNKNOWN); + case R.id.menu_reply_hard_bounce: + onMenuDsn(message, EntityMessage.DSN_HARD_BOUNCE); return true; case R.id.menu_forward: onMenuReply(message, "forward"); diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index b946141c5a..655dcbb34e 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -575,7 +575,7 @@ public class MessageHelper { imessage.setContent(report); return; - } else if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(message.dsn)) { + } else if (EntityMessage.DSN_HARD_BOUNCE.equals(message.dsn)) { // https://tools.ietf.org/html/rfc3464 Multipart report = new MimeMultipart("report; report-type=delivery-status"); diff --git a/app/src/main/res/menu/popup_reply.xml b/app/src/main/res/menu/popup_reply.xml index b516dd14f4..6b6b8c6906 100644 --- a/app/src/main/res/menu/popup_reply.xml +++ b/app/src/main/res/menu/popup_reply.xml @@ -17,8 +17,8 @@ android:title="@string/title_reply_receipt" /> + android:id="@+id/menu_reply_hard_bounce" + android:title="@string/title_reply_hard_bounce" /> Reply to all Reply to list Send read receipt - Report \'address unknown\' + Send hard bounce Reply with template Moving to %1$s (%2$d) Open with @@ -896,8 +896,8 @@ Read receipt: %1$s This read receipt only acknowledges that the message was displayed. There is no guarantee that the recipient has read the message contents. - Delivery Status Notification (Failure) - Your message wasn\'t delivered because the address couldn\'t be found. + Delivery Status Notification (Failure) + Your message wasn\'t delivered because the address couldn\'t be found. No reply templates defined No viewer app available for %1$s