diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/services/AvatarService.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/AvatarService.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java index aa861c147..bb05004d2 100644 --- a/src/main/java/de/pixart/messenger/services/AvatarService.java +++ b/src/main/java/de/pixart/messenger/services/AvatarService.java @@ -80,7 +80,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (avatar != null || cachedOnly) { return avatar; } - if (avatar == null && contact.getAvatarFilename() != null) { + if (contact.getAvatarFilename() != null) { avatar = mXmppConnectionService.getFileBackend().getAvatar(contact.getAvatarFilename(), size); } if (avatar == null && contact.getProfilePhoto() != null) { @@ -91,7 +91,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } } if (avatar == null) { - avatar = get(contact.getDisplayName(), contact.getJid().asBareJid().toString(), size, cachedOnly); + avatar = get(contact.getDisplayName(), contact.getJid().asBareJid().toString(), size, false); } this.mXmppConnectionService.getBitmapCache().put(KEY, avatar); return avatar; @@ -165,10 +165,10 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (avatar == null) { Contact contact = user.getContact(); if (contact != null) { - avatar = get(contact, size, cachedOnly); + avatar = get(contact, size, false); } else { String seed = user.getRealJid() != null ? user.getRealJid().asBareJid().toString() : null; - avatar = get(user.getName(), seed, size, cachedOnly); + avatar = get(user.getName(), seed, size, false); } } this.mXmppConnectionService.getBitmapCache().put(KEY, avatar); @@ -524,11 +524,14 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { Contact contact = user.getContact(); if (contact != null) { Uri uri = null; - if (contact.getProfilePhoto() != null) { + if (contact.getAvatarFilename() != null) { + try { + uri = mXmppConnectionService.getFileBackend().getAvatarUri(contact.getAvatarFilename()); + } catch (Exception e) { + e.printStackTrace(); + } + } else if (contact.getProfilePhoto() != null) { uri = Uri.parse(contact.getProfilePhoto()); - } else if (contact.getAvatarFilename() != null) { - uri = mXmppConnectionService.getFileBackend().getAvatarUri( - contact.getAvatarFilename()); } if (drawTile(canvas, uri, left, top, right, bottom)) { return true; |