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

Debug DSN

This commit is contained in:
M66B 2021-02-02 10:32:40 +01:00
parent 53ce38b2f1
commit 9202f63971
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)) {

3
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -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));