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

Use avatar of original sender when forwarded

This commit is contained in:
M66B 2023-09-15 15:13:21 +02:00
parent 9061f345a6
commit 7e67215356
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -1260,7 +1260,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
message.folderUnified && EntityFolder.isOutgoing(message.folderType)) ||
EntityFolder.isOutgoing(message.folderInheritedType);
String selector = (reverse ? null : message.bimi_selector);
Address[] addresses = (reverse ? message.to : message.from);
Address[] addresses = (reverse ? message.to : (message.isForwarder() ? message.submitter : message.from));
Address[] senders = ContactInfo.fillIn(
reverse && !show_recipients ? message.to : message.senders, prefer_contact, only_contact);
Address[] recipients = ContactInfo.fillIn(

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

@ -409,6 +409,19 @@ public class EntityMessage implements Serializable {
return notJunk;
}
boolean isForwarder() {
if (from == null || from.length != 1)
return false;
if (submitter == null || submitter.length != 1)
return false;
String email = ((InternetAddress) from[0]).getAddress();
String domain = UriHelper.getEmailDomain(email);
return "duck.com".equals(domain) ||
"simplelogin.co".equals(domain) ||
"mozmail.com".equals(domain) ||
"anonaddy.me".equals(domain);
}
String[] checkFromDomain(Context context) {
return MessageHelper.equalRootDomain(context, from, smtp_from);
}