Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-08 18:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Require DMARC for BIMI images"

Browse Source 
This reverts commit 7171455db7.
This commit is contained in:
M66B
2024-06-09 17:24:45 +02:00
parent b18bf94eff
commit 97a962cda2
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1305,7 +1305,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
message.folderUnified && outgoing) ||
EntityFolder.isOutgoing(message.folderInheritedType));
String selector = (reverse ? null : message.bimi_selector);
boolean dmarc = (!reverse && Boolean.TRUE.equals(message.dmarc));
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);
@@ -1679,7 +1678,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Contact info
ContactInfo[] info = ContactInfo.getCached(context,
message.account, message.folderType, selector, dmarc, addresses);
message.account, message.folderType, selector, addresses);
if (info == null) {
if (taskContactInfo != null) {
taskContactInfo.cancel(context);
@@ -1691,7 +1690,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
aargs.putLong("account", message.account);
aargs.putString("folderType", message.folderType);
aargs.putString("selector", selector);
aargs.putBoolean("dmarc", dmarc);
aargs.putSerializable("addresses", addresses);
taskContactInfo = new SimpleTask<ContactInfo[]>() {
@@ -1700,9 +1698,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
long account = args.getLong("account");
String folderType = args.getString("folderType");
String selector = args.getString("selector");
boolean dmarc = args.getBoolean("dmarc");
Address[] addresses = (Address[]) args.getSerializable("addresses");
return ContactInfo.get(context, account, folderType, selector, dmarc, addresses);
return ContactInfo.get(context, account, folderType, selector, addresses);
}
@Override
@@ -7602,7 +7599,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
args.putLong("account", message.account);
args.putString("folderType", message.folderType);
args.putString("selector", message.bimi_selector);
args.putBoolean("dmarc", Boolean.TRUE.equals(message.dmarc));
args.putSerializable("addresses", message.from);
new SimpleTask<ContactInfo[]>() {
@@ -7611,9 +7607,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
long account = args.getLong("account");
String folderType = args.getString("folderType");
String selector = args.getString("selector");
boolean dmarc = args.getBoolean("dmarc");
Address[] addresses = (Address[]) args.getSerializable("addresses");
return ContactInfo.get(context, account, folderType, selector, dmarc, addresses);
return ContactInfo.get(context, account, folderType, selector, addresses);
}
@Override