diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index 33de2d758e..df895b0354 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_USER_UNKNOWN = 2; + static final Integer DSN_ADDRESS_UNKNOWN = 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 53536c66c2..6328cca9b1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3622,7 +3622,7 @@ public class FragmentCompose extends FragmentBase { else if ("dsn".equals(action)) { if (EntityMessage.DSN_RECEIPT.equals(dsn) && ref.receipt_to != null) data.draft.to = ref.receipt_to; - else if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn) && ref.return_path != null) + else if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn) && ref.return_path != null) data.draft.to = ref.return_path; } else { // Prevent replying to self @@ -3733,14 +3733,14 @@ public class FragmentCompose extends FragmentBase { } else if ("list".equals(action)) { data.draft.subject = ref.subject; } else if ("dsn".equals(action)) { - if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn)) - data.draft.subject = context.getString(R.string.title_user_unknown_subject); + if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn)) + data.draft.subject = context.getString(R.string.title_address_unknown_subject); else data.draft.subject = context.getString(R.string.title_receipt_subject, subject); String[] texts; - if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn)) - texts = new String[]{context.getString(R.string.title_user_unknown_text)}; + if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn)) + texts = new String[]{context.getString(R.string.title_address_unknown_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 9f6c25f22b..44a5a8fcec 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_user_unknown) + popupMenu.getMenu().findItem(R.id.menu_reply_address_unknown) .setVisible(experiments && message.return_path != null && message.return_path.length > 0); popupMenu.getMenu().findItem(R.id.menu_new_message).setVisible(to != null && to.length > 0); popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context)); @@ -2476,8 +2476,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_user_unknown: - onMenuDsn(message, EntityMessage.DSN_USER_UNKNOWN); + case R.id.menu_reply_address_unknown: + onMenuDsn(message, EntityMessage.DSN_ADDRESS_UNKNOWN); 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 68ba6962a2..b946141c5a 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_USER_UNKNOWN.equals(message.dsn)) { + } else if (EntityMessage.DSN_ADDRESS_UNKNOWN.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 5075c4c4f1..b516dd14f4 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_address_unknown" + android:title="@string/title_reply_address_unknown" /> Reply to all Reply to list Send read receipt - Send user unknown + Report \'address unknown\' Reply with template Moving to %1$s (%2$d) Open with %1$s authentication failed - Delivery Status Notification (Failure) - Your message wasn\'t delivered because the address couldn\'t be found. - 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. + No reply templates defined No viewer app available for %1$s No suitable audio recorder app available