wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1608

Browse source 
Don't try to show invalid mail addresses in recipient selector

Fixes #1607
This commit is contained in:
cketti 2016-09-13 04:16:45 +02:00
commit 521c9129a5
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java
View file

@ -238,12 +238,14 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> {
}
}
Uri photoUri = cursor.isNull(INDEX_PHOTO_URI) ? null : Uri.parse(cursor.getString(INDEX_PHOTO_URI));
Recipient recipient = new Recipient(name, email, addressLabel, contactId, lookupKey);
recipient.photoThumbnailUri = photoUri;
if (recipient.isValidEmailAddress()) {
Uri photoUri = cursor.isNull(INDEX_PHOTO_URI) ? null : Uri.parse(cursor.getString(INDEX_PHOTO_URI));
recipientMap.put(email, recipient);
recipients.add(recipient);
recipient.photoThumbnailUri = photoUri;
recipientMap.put(email, recipient);
recipients.add(recipient);
}
}
cursor.close();

4
k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java
View file

@ -550,6 +550,10 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem
return address.getAddress();
}
public boolean isValidEmailAddress() {
return (address.getAddress() != null);
}
public String getDisplayNameOrUnknown(Context context) {
String displayName = getDisplayName();
if (displayName != null) {