mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Fixed showing avatars when no email address

Browse source
This commit is contained in:
M66B 2020-06-09 09:45:06 +02:00
parent 3de7db665e
commit 29f05b94ab
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -1139,21 +1139,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Address[] senders = (Address[]) args.getSerializable("senders");
Address[] recipients = (Address[]) args.getSerializable("recipients");
Map<String, Address> map = new HashMap<>();
if (senders != null)
for (Address a : senders) {
String email = ((InternetAddress) a).getAddress();
if (!TextUtils.isEmpty(email))
map.put(email, a);
}
if (recipients != null)
for (Address a : recipients) {
String email = ((InternetAddress) a).getAddress();
if (!TextUtils.isEmpty(email))
map.put(email, a);
}
if (senders == null)
senders = new Address[0];
if (recipients == null)
recipients = new Address[0];
return ContactInfo.get(context, account, map.values().toArray(new Address[0]));
Address[] all = new Address[senders.length + recipients.length];
System.arraycopy(senders, 0, all, 0, senders.length);
System.arraycopy(recipients, 0, all, senders.length, recipients.length);
return ContactInfo.get(context, account, all);
}
@Override
@ -1336,18 +1331,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void bindContactInfo(TupleMessageEx message, ContactInfo[] info, Address[] senders, Address[] recipients) {
Map<String, ContactInfo> map = new HashMap<>();
for (ContactInfo c : info)
map.put(c.getEmailAddress(), c);
if (avatars) {
ContactInfo main = null;
if (senders != null && senders.length > 0) {
String email = ((InternetAddress) senders[0]).getAddress();
if (!TextUtils.isEmpty(email))
main = map.get(email);
}
ContactInfo main = (info.length > 0 ? info[0] : null);
if (main == null || !main.hasPhoto()) {
ibAvatar.setImageDrawable(null);
ibAvatar.setTag(null);
@ -1364,14 +1349,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (distinguish_contacts) {
boolean known = false;
if (senders != null)
for (Address sender : senders) {
String email = ((InternetAddress) sender).getAddress();
if (!TextUtils.isEmpty(email) &&
map.containsKey(email) && map.get(email).isKnown()) {
for (int i = 0; i < senders.length; i++)
if (info[i].isKnown()) {
known = true;
break;
}
}
if (known)
tvFrom.setPaintFlags(tvFrom.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
}