Check for null email address

pull/194/head
M66B 5 years ago
parent 28dda31fb3
commit aab0617bf6

@ -1773,7 +1773,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.setLog(false).execute(context, owner, sargs, "message:tools"); }.setLog(false).execute(context, owner, sargs, "message:tools");
} }
Spanned formatAddresses(Address[] addresses, boolean full) { private Spanned formatAddresses(Address[] addresses, boolean full) {
SpannableStringBuilder ssb = new SpannableStringBuilder(); SpannableStringBuilder ssb = new SpannableStringBuilder();
if (addresses == null || addresses.length == 0) if (addresses == null || addresses.length == 0)
@ -1786,15 +1786,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
String personal = address.getPersonal(); String personal = address.getPersonal();
if (TextUtils.isEmpty(personal)) { if (TextUtils.isEmpty(personal)) {
int start = ssb.length(); if (email != null) {
ssb.append(email);
ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0);
} else {
if (full) {
ssb.append(personal).append(" <");
int start = ssb.length(); int start = ssb.length();
ssb.append(email); ssb.append(email);
ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0); ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0);
}
} else {
if (full) {
ssb.append(personal).append(" <");
if (email != null) {
int start = ssb.length();
ssb.append(email);
ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0);
}
ssb.append(">"); ssb.append(">");
} else } else
ssb.append(personal); ssb.append(personal);

Loading…
Cancel
Save