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

Merge branch 'master' of github.com:M66B/FairEmail

This commit is contained in:
M66B 2022-06-20 22:04:57 +02:00
parent 0fdd510381 e21767f3dc
commit 7e12919862
2 changed files with 9 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/FragmentMessages.java
View File

@ -3150,10 +3150,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (context == null)
return;
final Address[] to =
message.replySelf(data.identities, message.account)
? message.to
: (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
boolean replySelf = message.replySelf(data.identities, message.account);
final Address[] to = replySelf
? message.to
: (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
Address[] recipients = message.getAllRecipients(data.identities, message.account);
@ -3199,7 +3199,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.getMenu().findItem(R.id.menu_resend).setEnabled(canResend);
popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context));
popupMenu.getMenu().findItem(R.id.menu_reply_to_sender).setEnabled(message.content);
popupMenu.getMenu().findItem(R.id.menu_reply_to_sender)
.setTitle(getString(replySelf ? R.string.title_reply_to_recipient : R.string.title_reply_to_sender))
.setEnabled(message.content);
popupMenu.getMenu().findItem(R.id.menu_reply_to_all).setEnabled(message.content);
popupMenu.getMenu().findItem(R.id.menu_forward).setEnabled(message.content);
popupMenu.getMenu().findItem(R.id.menu_forward_raw)

1
app/src/main/res/values/strings.xml
View File

@ -1246,6 +1246,7 @@
<string name="title_archive">Archive</string>
<string name="title_reply">Reply</string>
<string name="title_reply_to_sender">Reply to sender</string>
<string name="title_reply_to_recipient">Reply to recipient</string>
<string name="title_reply_to_all">Reply to all</string>
<string name="title_reply_list">Reply to list</string>
<string name="title_reply_receipt">Send read receipt</string>