From bf8c113f9a4d38f18f96a968e39a4ef690d3a492 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 28 Dec 2022 11:54:56 +0100 Subject: [PATCH] Spotbugs: prevent possible NPE deference Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/utils/DisplayUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java index 48beb604e..e48ed823a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java @@ -369,8 +369,6 @@ public class DisplayUtils { decor.setSystemUiVisibility(0); } window.setStatusBarColor(color); - } else if (isLightTheme) { - window.setStatusBarColor(Color.BLACK); } } @@ -455,10 +453,12 @@ public class DisplayUtils { avatarId = user.getUsername(); } - if (deleteCache) { - ImageViewExtensionsKt.replaceAvatar(avatarImageView, user, avatarId, true); - } else { - ImageViewExtensionsKt.loadAvatar(avatarImageView, user, avatarId, true); + if (avatarId != null) { + if (deleteCache) { + ImageViewExtensionsKt.replaceAvatar(avatarImageView, user, avatarId, true); + } else { + ImageViewExtensionsKt.loadAvatar(avatarImageView, user, avatarId, true); + } } }