Browse Source

Spotbugs: prevent possible NPE deference

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 years ago
parent
commit
bf8c113f9a
1 changed files with 6 additions and 6 deletions
  1. 6 6
      app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java

+ 6 - 6
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java

@@ -369,8 +369,6 @@ public class DisplayUtils {
                 decor.setSystemUiVisibility(0);
                 decor.setSystemUiVisibility(0);
             }
             }
             window.setStatusBarColor(color);
             window.setStatusBarColor(color);
-        } else if (isLightTheme) {
-            window.setStatusBarColor(Color.BLACK);
         }
         }
     }
     }
 
 
@@ -455,10 +453,12 @@ public class DisplayUtils {
             avatarId = user.getUsername();
             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);
+            }
         }
         }
     }
     }