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