Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-05 20:34:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fill in name from contacts

Browse Source
This commit is contained in:
M66B
2019-12-19 21:37:09 +01:00
parent 3ec0ba375a
commit 26f3fe4893
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,7 +923,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (amessage == null || !amessage.id.equals(id))
return;
bindContactInfo(info, message);
bindContactInfo(info, addresses, name_email);
}
@Override
@@ -932,7 +932,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}.setLog(false).execute(context, owner, aargs, "message:avatar");
} else
bindContactInfo(info, message);
bindContactInfo(info, addresses, name_email);
if (viewType == ViewType.THREAD)
if (expanded)
@@ -1045,7 +1045,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFlagged.setVisibility(View.GONE);
}
private void bindContactInfo(ContactInfo info, TupleMessageEx message) {
private void bindContactInfo(ContactInfo info, Address[] addresses, boolean name_email) {
if (info.hasPhoto()) {
ibAvatar.setImageBitmap(info.getPhotoBitmap());
ibAvatar.setVisibility(View.VISIBLE);
@@ -1056,6 +1056,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setTag(lookupUri);
ibAvatar.setEnabled(lookupUri != null);
if (addresses != null && addresses.length == 1) {
String displayName = info.getDisplayName();
if (!TextUtils.isEmpty(displayName)) {
String personal = ((InternetAddress) addresses[0]).getPersonal();
if (TextUtils.isEmpty(personal))
try {
((InternetAddress) addresses[0]).setPersonal(displayName);
tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
}
}
if (distinguish_contacts && info.isKnown())
tvFrom.setPaintFlags(tvFrom.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
}

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

@@ -70,6 +70,10 @@ public class ContactInfo {
return bitmap;
}
String getDisplayName() {
return displayName;
}
String getDisplayName(boolean name_email) {
if (!name_email && displayName != null)
return displayName;