return null;
}
String avatarId = profile.getAvatar();
- if (avatarId != null) {
- if (core.getImage(avatarId, false) == null) {
- /* avatar ID but no matching image? show nothing. */
- return null;
- }
+ if (avatarId == null) {
+ return null;
+ }
+ if (core.getImage(avatarId, false) == null) {
+ /* avatar ID but no matching image? show nothing. */
+ return null;
}
Sone remoteSone = profile.getSone();
if (core.isLocalSone(remoteSone)) {
if (showCustomAvatars == ShowCustomAvatars.NEVER) {
return null;
}
- if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
+ if (showCustomAvatars == ShowCustomAvatars.ALWAYS) {
return avatarId;
}
- if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
- return avatarId;
+ if (showCustomAvatars == ShowCustomAvatars.FOLLOWED) {
+ return currentSone.hasFriend(remoteSone.getId()) ? avatarId : null;
}
Trust trust = core.getTrust(currentSone, remoteSone);
if (trust == null) {