msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Require DMARC for BIMI images"

Browse Source 
This reverts commit 7171455db7.
pull/215/head
M66B 8 months ago
parent b18bf94eff
commit 97a962cda2
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

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

16
app/src/main/java/eu/faircode/email/ContactInfo.java
Unescape View File

@ -219,15 +219,15 @@ public class ContactInfo {
} }
@NonNull @NonNull
static ContactInfo[] get(Context context, long account, String folderType, String selector, boolean dmarc, Address[] addresses) { static ContactInfo[] get(Context context, long account, String folderType, String selector, Address[] addresses) {
return get(context, account, folderType, selector, dmarc, addresses, false); return get(context, account, folderType, selector, addresses, false);
} }
static ContactInfo[] getCached(Context context, long account, String folderType, String selector, boolean dmarc, Address[] addresses) { static ContactInfo[] getCached(Context context, long account, String folderType, String selector, Address[] addresses) {
return get(context, account, folderType, selector, dmarc, addresses, true); return get(context, account, folderType, selector, addresses, true);
} }
private static ContactInfo[] get(Context context, long account, String folderType, String selector, boolean dmarc, Address[] addresses, boolean cacheOnly) { private static ContactInfo[] get(Context context, long account, String folderType, String selector, Address[] addresses, boolean cacheOnly) {
if (addresses == null || addresses.length == 0) { if (addresses == null || addresses.length == 0) {
ContactInfo anonymous = getAnonymous(context); ContactInfo anonymous = getAnonymous(context);
return new ContactInfo[]{anonymous == null ? new ContactInfo() : anonymous}; return new ContactInfo[]{anonymous == null ? new ContactInfo() : anonymous};
@ -235,7 +235,7 @@ public class ContactInfo {
ContactInfo[] result = new ContactInfo[addresses.length]; ContactInfo[] result = new ContactInfo[addresses.length];
for (int i = 0; i < addresses.length; i++) { for (int i = 0; i < addresses.length; i++) {
result[i] = _get(context, account, folderType, selector, dmarc, (InternetAddress) addresses[i], cacheOnly); result[i] = _get(context, account, folderType, selector, (InternetAddress) addresses[i], cacheOnly);
if (result[i] == null) { if (result[i] == null) {
if (cacheOnly) if (cacheOnly)
return null; return null;
@ -257,7 +257,7 @@ public class ContactInfo {
private static ContactInfo _get( private static ContactInfo _get(
Context context, Context context,
long account, String folderType, long account, String folderType,
String selector, boolean dmarc, InternetAddress address, boolean cacheOnly) { String selector, InternetAddress address, boolean cacheOnly) {
String key = MessageHelper.formatAddresses(new Address[]{address}); String key = MessageHelper.formatAddresses(new Address[]{address});
synchronized (emailContactInfo) { synchronized (emailContactInfo) {
ContactInfo info = emailContactInfo.get(key); ContactInfo info = emailContactInfo.get(key);
@ -277,7 +277,7 @@ public class ContactInfo {
boolean avatars = prefs.getBoolean("avatars", true); boolean avatars = prefs.getBoolean("avatars", true);
boolean prefer_contact = prefs.getBoolean("prefer_contact", false); boolean prefer_contact = prefs.getBoolean("prefer_contact", false);
boolean distinguish_contacts = prefs.getBoolean("distinguish_contacts", false); boolean distinguish_contacts = prefs.getBoolean("distinguish_contacts", false);
boolean bimi = (prefs.getBoolean("bimi", false) && dmarc && !BuildConfig.PLAY_STORE_RELEASE); boolean bimi = (prefs.getBoolean("bimi", false) && !BuildConfig.PLAY_STORE_RELEASE);
boolean gravatars = (prefs.getBoolean("gravatars", false) && !BuildConfig.PLAY_STORE_RELEASE); boolean gravatars = (prefs.getBoolean("gravatars", false) && !BuildConfig.PLAY_STORE_RELEASE);
boolean libravatars = (prefs.getBoolean("libravatars", false) && !BuildConfig.PLAY_STORE_RELEASE); boolean libravatars = (prefs.getBoolean("libravatars", false) && !BuildConfig.PLAY_STORE_RELEASE);
boolean favicons = prefs.getBoolean("favicons", false); boolean favicons = prefs.getBoolean("favicons", false);

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

@ -717,8 +717,7 @@ class NotificationHelper {
latest = message.received; latest = message.received;
ContactInfo[] info = ContactInfo.get(context, ContactInfo[] info = ContactInfo.get(context,
message.account, message.folderType, message.account, message.folderType, message.bimi_selector,
message.bimi_selector, Boolean.TRUE.equals(message.dmarc),
message.isForwarder() ? message.submitter : message.from); message.isForwarder() ? message.submitter : message.from);
Address[] modified = (message.from == null Address[] modified = (message.from == null

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

@ -238,8 +238,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
if (avatars) { if (avatars) {
ContactInfo[] info = ContactInfo.get(context, ContactInfo[] info = ContactInfo.get(context,
message.account, null, message.account, null, message.bimi_selector,
message.bimi_selector, Boolean.TRUE.equals(message.dmarc),
message.isForwarder() ? message.submitter : message.from); message.isForwarder() ? message.submitter : message.from);
views.setImageViewBitmap(R.id.avatar, info.length == 0 ? null : info[0].getPhotoBitmap()); views.setImageViewBitmap(R.id.avatar, info.length == 0 ? null : info[0].getPhotoBitmap());
} }

Write Preview
Loading…
Cancel
Save