if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
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) {
if ((showCustomAvatars == ShowCustomAvatars.MANUALLY_TRUSTED) && (trust.getExplicit() != null) && (trust.getExplicit() > 0)) {
return avatarId;
}
- if ((showCustomAvatars == ShowCustomAvatars.TRUSTED) && ((trust.getExplicit() != null) && (trust.getExplicit() > 0)) || ((trust.getImplicit() != null) && (trust.getImplicit() > 0))) {
+ if ((showCustomAvatars == ShowCustomAvatars.TRUSTED) && (((trust.getExplicit() != null) && (trust.getExplicit() > 0)) || ((trust.getImplicit() != null) && (trust.getImplicit() > 0)))) {
return avatarId;
}
return null;