diff options
| author | Christian S <kriztan@users.noreply.github.com> | 2015-07-04 13:23:03 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-04 16:21:49 +0200 |
| commit | d5c03e5ab3f381789bf1b57717e9bb2f271004b9 (patch) | |
| tree | 725cf22aee2e0df6cbffcd573da963c2006ce0c4 /src/main/java/eu/siacs/conversations/services/AvatarService.java | |
| parent | 23cf6157d5bbadff9dc88a5af934f7f7d0feb591 (diff) | |
small avatar modifications
*show bigger avatar in contact details
*prefer profile avatar instead of contact picture from addressbook
*show more bigger avatar in contact details
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/AvatarService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index 7412eb933..e88047f67 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -44,12 +44,12 @@ public class AvatarService { if (avatar != null || cachedOnly) { return avatar; } - if (contact.getProfilePhoto() != null) { - avatar = mXmppConnectionService.getFileBackend().cropCenterSquare(Uri.parse(contact.getProfilePhoto()), size); - } if (avatar == null && contact.getAvatar() != null) { avatar = mXmppConnectionService.getFileBackend().getAvatar(contact.getAvatar(), size); } + if (avatar == null && contact.getProfilePhoto() != null) { + avatar = mXmppConnectionService.getFileBackend().cropCenterSquare(Uri.parse(contact.getProfilePhoto()), size); + } if (avatar == null) { avatar = get(contact.getDisplayName(), size, cachedOnly); } @@ -265,11 +265,11 @@ public class AvatarService { Contact contact = user.getContact(); if (contact != null) { Uri uri = null; - if (contact.getProfilePhoto() != null) { - uri = Uri.parse(contact.getProfilePhoto()); - } else if (contact.getAvatar() != null) { + if (contact.getAvatar() != null) { uri = mXmppConnectionService.getFileBackend().getAvatarUri( contact.getAvatar()); + } else if (contact.getProfilePhoto() != null) { + uri = Uri.parse(contact.getProfilePhoto()); } if (uri != null) { Bitmap bitmap = mXmppConnectionService.getFileBackend() |