aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-12-29 13:59:29 +0100
committerChristian S <christian@pix-art.de>2015-12-29 13:59:29 +0100
commitfa1817dd634284d79bb8e596dba34bbf1034e36f (patch)
treecbe0456bd4cedff8aab184df42ede81cad456bc3 /src/main
parent9c677377aa06410ffe93f8da48493595e39a8981 (diff)
parent42fb9539f82252b86b62622eef2266826714637d (diff)
copy commits
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/UIHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index cac23f077..cf1e0d3b9 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -131,7 +131,7 @@ public class UIHelper {
}
public static int getColorForName(String name) {
- if (name.isEmpty()) {
+ if (name == null || name.isEmpty()) {
return 0xFF202020;
}
int colors[] = {0xFFe91e63, 0xFF9c27b0, 0xFF673ab7, 0xFF3f51b5,