From 9202f63971c47a94fdbb8f069dbfae96749b16b1 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 2 Feb 2021 10:32:40 +0100 Subject: [PATCH] Debug DSN --- .../java/eu/faircode/email/FragmentCompose.java | 13 +++++++++---- .../java/eu/faircode/email/FragmentMessages.java | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index d4b144709d..0581f4d487 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3623,10 +3623,15 @@ public class FragmentCompose extends FragmentBase { if ("list".equals(action) && ref.list_post != null) data.draft.to = ref.list_post; 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_ADDRESS_UNKNOWN.equals(dsn) && ref.return_path != null) - data.draft.to = ref.return_path; + 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)) { + if (ref.return_path != null) + data.draft.to = ref.return_path; + else if (BuildConfig.DEBUG) + data.draft.to = ref.from; + } } else { // Prevent replying to self if (ref.replySelf(data.identities, ref.account)) { diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index e5f00a386c..2d2abe7796 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2432,7 +2432,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. 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) - .setVisible(experiments && message.return_path != null && message.return_path.length > 0); + .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); popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context));