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

Fast contact fill in, cleanup

Browse Source
This commit is contained in:
M66B
2020-05-06 22:30:47 +02:00
parent d77f7ebdcf
commit a6ca8630db
5 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -827,8 +827,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean outbox = EntityFolder.OUTBOX.equals(message.folderType);
boolean outgoing = isOutgoing(message);
boolean reverse = (outgoing && (viewType != ViewType.THREAD || !threading) && !show_recipients);
Address[] senders = (reverse ? message.to : message.senders);
Address[] recipients = (reverse ? message.from : message.recipients);
Address[] senders = ContactInfo.fillIn(reverse ? message.to : message.senders, prefer_contact);
Address[] recipients = ContactInfo.fillIn(reverse ? message.from : message.recipients, prefer_contact);
boolean authenticated =
!(Boolean.FALSE.equals(message.dkim) ||
Boolean.FALSE.equals(message.spf) ||
@@ -1321,16 +1321,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setVisibility(main == null || !main.hasPhoto() ? View.GONE : View.VISIBLE);
}
Address[] _senders = fillIn(senders, map);
Address[] _recipients = fillIn(recipients, map);
if (_senders != null || _recipients != null)
if (show_recipients && recipients != null && recipients.length > 0)
tvFrom.setText(context.getString(R.string.title_from_to,
MessageHelper.formatAddresses(_senders == null ? senders : _senders, name_email, false),
MessageHelper.formatAddresses(_recipients == null ? recipients : _recipients, name_email, false)));
else
tvFrom.setText(MessageHelper.formatAddresses(_senders, name_email, false));
if (distinguish_contacts) {
boolean known = false;
if (senders != null)
@@ -1347,40 +1337,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
private Address[] fillIn(Address[] addresses, Map<String, ContactInfo> map) {
if (addresses == null)
return null;
boolean updated = false;
List<Address> modified = new ArrayList<>();
for (Address a : addresses) {
String email = ((InternetAddress) a).getAddress();
if (TextUtils.isEmpty(email) || !map.containsKey(email))
modified.add(a);
else {
String displayName = map.get(email).getDisplayName();
if (TextUtils.isEmpty(displayName))
modified.add(a);
else {
String personal = ((InternetAddress) a).getPersonal();
if (TextUtils.isEmpty(personal) ||
(prefer_contact && !personal.equals(displayName)))
try {
modified.add(new InternetAddress(email, displayName, StandardCharsets.UTF_8.name()));
updated = true;
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
modified.add(a);
}
else
modified.add(a);
}
}
}
return (updated ? modified.toArray(new Address[0]) : null);
}
private void bindExpandWarning(TupleMessageEx message, boolean expanded) {
if (viewType != ViewType.THREAD || expanded || message.content || message.uid == null || unmetered)
tvExpand.setVisibility(View.GONE);