Exit accessor earlier if avatar ID is null.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ProfileAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index 8c7d1e4..366e071 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -61,11 +61,12 @@ public class ProfileAccessor extends ReflectionAccessor {
                                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)) {
@@ -76,11 +77,11 @@ public class ProfileAccessor extends ReflectionAccessor {
                        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) {
@@ -89,7 +90,7 @@ public class ProfileAccessor extends ReflectionAccessor {
                        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;